README: TODO tg tidy -> tg collapse

[topgit.git] / tg-summary.sh

diff --git a/tg-summary.sh b/tg-summary.sh
index 89b638b9b817476d885fa9cc038f49e552d5a839..3905a8fab0207e9b3908e57d90e494f109b5efa1 100644 (file)
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -14,23 +14,27 @@ 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 name ref; do
+               name="${ref#refs/top-bases/}"
+               missing_deps=
 
+               nonempty=' '
+               ! branch_empty "$name" || nonempty='0'
                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$deps_update$deps_missing$base_update" \
+                       "$name" "$subject"
        done