X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg.sh;h=e7c42cd6b8f27cfad9975461ad884150d75cde98;hb=84bad158258c72b5e352e26d8a01eed9f7bf8224;hp=ae3dcda6446709183cf2f1032777f41655149a57;hpb=308892d0c071135031994606170c8be6653e7197;p=topgit.git

diff --git a/tg.sh b/tg.sh
index ae3dcda..e7c42cd 100644
--- a/tg.sh
+++ b/tg.sh
@@ -21,7 +21,8 @@ die()
 setup_hook()
 {
 	hook_call="\"\$(tg --hooks-path)\"/$1 \"\$@\""
-	if fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
+	if [ -f "$git_dir/hooks/$1" ] &&
+	   fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
 		# Another job well done!
 		return
 	fi
@@ -35,7 +36,7 @@ setup_hook()
 	{
 		echo "#!/bin/sh"
 		echo "$hook_call"
-		cat "$git_dir/hooks/$1"
+		[ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
 	} >"$git_dir/hooks/$1+"
 	chmod a+x "$git_dir/hooks/$1+"
 	mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
@@ -76,7 +77,7 @@ measure_branch()
 # Whether B1 is a superset of B2.
 branch_contains()
 {
-	[ "$(git rev-list ^"$1" "$2" | wc -l)" -eq 0 ]
+	[ -z "$(git rev-list ^"$1" "$2")" ]
 }
 
 # needs_update NAME [BRANCHPATH...]
@@ -84,32 +85,54 @@ branch_contains()
 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
 # inner paths first. Innermost name can be ':' if the head is
 # not in sync with the base.
+# It will also return non-zero status if NAME needs update.
+# If needs_update() hits missing dependencies, it will append
+# them to space-separated $missing_deps list and skip them.
 needs_update()
 {
-	{
-	git cat-file blob "$1:.topdeps" 2>/dev/null |
-		while read _dep; do
-			_dep_is_tgish=1
-			git rev-parse --verify "refs/top-bases/$_dep" >/dev/null 2>&1 ||
-				_dep_is_tgish=
-
-			# Shoo shoo, keep our environment alone!
-			[ -z "$_dep_is_tgish" ] || (needs_update "$_dep" "$@")
-
-			_dep_base_uptodate=1
-			if [ -n "$_dep_is_tgish" ]; then
-				branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_uptodate=
-			fi
-
-			if [ -z "$_dep_base_uptodate" ]; then
-				# _dep needs to be synced with its base
-				echo ": $_dep $*"
-			elif ! branch_contains "refs/top-bases/$1" "$_dep"; then
-				# Some new commits in _dep
-				echo "$_dep $*"
-			fi
-		done
-	} || : # $1 is not tracked by TopGit anymore
+	depsfile="$(mktemp)"
+	git cat-file blob "$1:.topdeps" >"$depsfile"
+	_ret=0
+	while read _dep; do
+		if ! git rev-parse --verify "$_dep" >/dev/null 2>&1; then
+			# All hope is lost
+			missing_deps="$missing_deps $_dep"
+			continue
+		fi
+
+		_dep_is_tgish=1
+		git rev-parse --verify "refs/top-bases/$_dep" >/dev/null 2>&1 ||
+			_dep_is_tgish=
+
+		# Shoo shoo, keep our environment alone!
+		[ -z "$_dep_is_tgish" ] ||
+			(needs_update "$_dep" "$@") ||
+			_ret=$?
+
+		_dep_base_uptodate=1
+		if [ -n "$_dep_is_tgish" ]; then
+			branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_uptodate=
+		fi
+
+		if [ -z "$_dep_base_uptodate" ]; then
+			# _dep needs to be synced with its base
+			echo ": $_dep $*"
+			_ret=1
+		elif ! branch_contains "refs/top-bases/$1" "$_dep"; then
+			# Some new commits in _dep
+			echo "$_dep $*"
+			_ret=1
+		fi
+	done <"$depsfile"
+	missing_deps="${missing_deps# }"
+	rm "$depsfile"
+	return $_ret
+}
+
+# branch_empty NAME
+branch_empty()
+{
+	[ -z "$(git diff-tree "refs/top-bases/$1" "$1" | fgrep -v "	.top")" ]
 }
 
 # switch_to_base NAME [SEED]
@@ -148,7 +171,7 @@ shift
 
 case "$cmd" in
 help)
-	echo "TopGit - A different patch queue manager"
+	echo "TopGit v0.1 - A different patch queue manager"
 	echo "Usage: tg (create|delete|info|patch|summary|update|help) ..."
 	exit 1;;
 create|delete|info|patch|summary|update)