X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-summary.sh;h=8616d074dc6f392f9ec1df1533339bfa6ffdc021;hb=a8d65d218c971d013e294be03e123114093f4e74;hp=89b638b9b817476d885fa9cc038f49e552d5a839;hpb=465528d881231eddeb3e5909b6ad18bf5a8f6f8d;p=topgit.git

diff --git a/tg-summary.sh b/tg-summary.sh
index 89b638b..8616d07 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -14,23 +14,37 @@ fi
 
 ## List branches
 
-git for-each-ref refs/heads | cut -f 2 |
-	while read ref; do
-		name="${ref#refs/heads/}"
-		git rev-parse --verify "refs/top-bases/$name" >/dev/null 2>&1 ||
-			continue # not a TopGit branch
-
+git for-each-ref refs/top-bases |
+	while read rev type ref; do
+		name="${ref#refs/top-bases/}"
+		missing_deps=
+
+		nonempty=' '
+		! branch_empty "$name" || nonempty='0'
+		remote=' '
+		[ -z "$base_remote" ] || remote='l'
+		! has_remote "$name" || remote='r'
+		rem_update=' '
+		[ "$remote" != 'r' ] || {
+			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" ||
+			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' "$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+			"$name" "$subject"
 	done