X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-export.sh;h=62ea4f97f732b0d0f27e7b98ed742a7c8f5503ba;hp=9f1930027e6bc6325d170b6e83fe8db2e2bed11f;hb=e5274deedc606f3a2eb69886e127a60534a82872;hpb=074eb3f1b432d95880fcc2c5b388bebac75046e9

diff --git a/tg-export.sh b/tg-export.sh
index 9f19300..62ea4f9 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -5,6 +5,7 @@
 
 name=
 output=
+driver=collapse
 
 
 ## Parse options
@@ -12,11 +13,15 @@ output=
 while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
+	--quilt)
+		driver=quilt;;
+	--collapse)
+		driver=collapse;;
 	-*)
-		echo "Usage: tg export NEWBRANCH" >&2
+		echo "Usage: tg export ([--collapse] NEWBRANCH | --quilt DIRECTORY)" >&2
 		exit 1;;
 	*)
-		[ -z "$output" ] || die "new branch already specified ($output)"
+		[ -z "$output" ] || die "output already specified ($output)"
 		output="$arg";;
 	esac
 done
@@ -26,15 +31,12 @@ name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
 	die "not on a TopGit-controlled branch"
 
-[ -n "$output" ] ||
-	die "no target branch specified"
 
-! git rev-parse --verify "$output" >/dev/null 2>&1 ||
-	die "target branch '$output' already exists; first run: git branch -D $output"
+playground="$(mktemp -d -t tg-export.XXXXXX)"
+trap 'rm -rf "$playground"' EXIT
 
 
-playground="$(mktemp -d)"
-trap 'rm -rf "$playground"' EXIT
+## Collapse driver
 
 # Trusty Cogito code:
 load_author()
@@ -53,7 +55,7 @@ pretty_tree()
 {
 	(export GIT_INDEX_FILE="$playground/^index"
 	 git read-tree "$1"
-	 git update-index --force-remove ".top*"
+	 git update-index --force-remove ".topmsg" ".topdeps"
 	 git write-tree)
 }
 
@@ -105,15 +107,11 @@ collapsed_commit()
 	echo "$name" >>"$playground/^ticker"
 }
 
-# collapse_one
+# collapse
 # This will collapse a single branch, using information about
 # previously collapsed branches stored in $playground.
-collapse_one()
+collapse()
 {
-	branch_needs_update >/dev/null
-	[ "$_ret" -eq 0 ] ||
-		die "cancelling $_ret export of $_dep (-> $_name): branch not up-to-date"
-
 	if [ -s "$playground/$_dep" ]; then
 		# We've already seen this dep
 		commit="$(cat "$playground/$_dep")"
@@ -124,11 +122,10 @@ collapse_one()
 
 	else
 		# First time hitting this dep; the common case
+		echo "Collapsing $_dep"
 		commit="$(collapsed_commit "$_dep")"
-
 		mkdir -p "$playground/$(dirname "$_dep")"
 		echo "$commit" >"$playground/$_dep"
-		echo "Collapsed $_dep"
 	fi
 
 	# Propagate our work through the dependency chain
@@ -136,12 +133,69 @@ collapse_one()
 	echo "$commit	$_dep" >>"$playground/$_name^parents"
 }
 
-# Collapse all the branches - this way, collapse_one will be
-# called in topological order.
-recurse_deps collapse_one "$name"
-(_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; collapse_one)
 
-git update-ref "refs/heads/$output" "$(cat "$playground/$name")"
+## Quilt driver
+
+quilt()
+{
+	if [ -z "$_dep_is_tgish" ]; then
+		# This dep is not for rewrite
+		return
+	fi
+
+	filename="$output/$_dep.diff"
+	if [ -e "$filename" ]; then
+		# We've already seen this dep
+		return
+	fi
+
+	echo "Exporting $_dep"
+	mkdir -p "$(dirname "$filename")"
+	tg patch "$_dep" >"$filename"
+	echo "$_dep.diff -p1" >>"$output/series"
+}
+
+
+## Machinery
+
+if [ "$driver" = "collapse" ]; then
+	[ -n "$output" ] ||
+		die "no target branch specified"
+	! git rev-parse --verify "$output" >/dev/null 2>&1 ||
+		die "target branch '$output' already exists; first run: git branch -D $output"
+
+elif [ "$driver" = "quilt" ]; then
+	[ -n "$output" ] ||
+		die "no target directory specified"
+	[ ! -e "$output" ] ||
+		die "target directory already exists: $output"
+
+	mkdir -p "$output"
+fi
+
+
+driver()
+{
+	branch_needs_update >/dev/null
+	[ "$_ret" -eq 0 ] ||
+		die "cancelling export of $_dep (-> $_name): branch not up-to-date"
+
+	$driver
+}
+
+# Call driver on all the branches - this will happen
+# in topological order.
+recurse_deps driver "$name"
+(_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver)
+
+
+if [ "$driver" = "collapse" ]; then
+	git update-ref "refs/heads/$output" "$(cat "$playground/$name")" ""
+
+	depcount="$(cat "$playground/^ticker" | wc -l)"
+	echo "Exported topic branch $name (total $depcount topics) to branch $output"
 
-depcount="$(cat "$playground/^ticker" | wc -l)"
-echo "Exported topic branch $name (total $depcount topics) to branch $output"
+elif [ "$driver" = "quilt" ]; then
+	depcount="$(cat "$output/series" | wc -l)"
+	echo "Exported topic branch $name (total $depcount topics) to directory $output"
+fi