X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-export.sh;h=52af88dfd14e891627b145f63702b1212155a82c;hb=c7692a249e6ed4cac8efd97279aee1023a6adf3b;hp=335f698b5ce8d3907f31c08df24fd37bdbd365e7;hpb=7a0af6f34b119a80357190bb0008e6ba5559f005;p=topgit.git

diff --git a/tg-export.sh b/tg-export.sh
index 335f698..52af88d 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -4,6 +4,7 @@
 # GPLv2
 
 name=
+branches=
 output=
 driver=collapse
 
@@ -13,12 +14,14 @@ driver=collapse
 while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
+	-b)
+		branches="$1"; shift;;
 	--quilt)
 		driver=quilt;;
 	--collapse)
 		driver=collapse;;
 	-*)
-		echo "Usage: tg [...] export ([--collapse] NEWBRANCH | --quilt DIRECTORY)" >&2
+		echo "Usage: tg [...] export ([--collapse] NEWBRANCH | [-b BRANCH1,BRANCH2...] --quilt DIRECTORY)" >&2
 		exit 1;;
 	*)
 		[ -z "$output" ] || die "output already specified ($output)"
@@ -27,9 +30,16 @@ while [ -n "$1" ]; do
 done
 
 
-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"
+
+[ -z "$branches" -o "$driver" = "quilt" ] ||
+	die "-b works only with the quilt driver"
+
+if [ -z "$branches" ]; then
+	# this check is only needed when no branches have been passed
+	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"
+fi
 
 
 playground="$(mktemp -d -t tg-export.XXXXXX)"
@@ -157,6 +167,7 @@ fi
 
 driver()
 {
+	case $_dep in refs/remotes/*) return;; esac
 	branch_needs_update >/dev/null
 	[ "$_ret" -eq 0 ] ||
 		die "cancelling export of $_dep (-> $_name): branch not up-to-date"
@@ -166,8 +177,16 @@ 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 [ -z "$branches" ]; then
+	recurse_deps driver "$name"
+	(_ret=0; _dep="$name"; _name=""; _dep_is_tgish=1; driver)
+else
+	echo "$branches" | tr ',' '\n' | while read _dep; do
+		_dep_is_tgish=1
+		$driver
+	done
+	name="$(echo "$branches" | sed 's/.*,//')"
+fi
 
 
 if [ "$driver" = "collapse" ]; then