X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=409f45622910caf29b5f6d68a2930b3f76b6a274;hp=c608a18fae93d41352d65937cd5dc938846df9ae;hb=ff2a44e9b68cfbc5f970bd07bad252607dd8179a;hpb=308892d0c071135031994606170c8be6653e7197

diff --git a/tg-summary.sh b/tg-summary.sh
index c608a18..409f456 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -7,32 +7,48 @@
 ## Parse options
 
 if [ -n "$1" ]; then
-	echo "Usage: tg summary" >&2
+	echo "Usage: tg [...] summary" >&2
 	exit 1
 fi
 
+curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 
-## List branches
 
-git for-each-ref | cut -f 2 |
-	while read ref; do
-		name="${ref#refs/heads/}"
-		[ "$name" != "$ref" ] ||
-			continue # eew, not a branch
-		git rev-parse --verify "refs/top-bases/$name" >/dev/null 2>&1 ||
-			continue # not a TopGit branch
+## List branches
 
+git for-each-ref refs/top-bases |
+	while read rev type ref; do
+		name="${ref#refs/top-bases/}"
+		missing_deps=
+
+		current=' '
+		[ "$name" != "$curname" ] || current='>'
+		nonempty=' '
+		! branch_empty "$name" || nonempty='0'
+		remote=' '
+		[ -z "$base_remote" ] || remote='l'
+		! has_remote "$name" || remote='r'
+		rem_update=' '
+		[ "$remote" != 'r' ] || ! ref_exists "refs/remotes/$base_remote/top-bases/$name" || {
+			branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" &&
+			branch_contains "$name" "refs/remotes/$base_remote/$name"
+		} || rem_update='R'
+		[ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name" 2>/dev/null ||
+			rem_update='L'
 		deps_update=' '
-		[ -z "$(needs_update "$name")" ] || deps_update='D'
+		needs_update "$name" >/dev/null || deps_update='D'
+		deps_missing=' '
+		[ -z "$missing_deps" ] || deps_missing='!'
 		base_update=' '
 		branch_contains "$name" "refs/top-bases/$name" || base_update='B'
 
-		if [ "$(git rev-parse "$name")" != "$(git rev-parse "refs/top-bases/$name")" ]; then
+		if [ "$(git rev-parse "$name")" != "$rev" ]; then
 			subject="$(git cat-file blob "$name:.topmsg" | sed -n 's/^Subject: //p')"
 		else
 			# No commits yet
 			subject="(No commits)"
 		fi
 
-		printf '%s%s\t%-31s\t%s\n' "$deps_update" "$base_update" "$name" "$subject"
+		printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+			"$name" "$subject"
 	done