put die() messages to stderr

[topgit.git] / tg-summary.sh

diff --git a/tg-summary.sh b/tg-summary.sh
index a2cb9862cec62195383c8d571604676a7b9a1971..af16888c1797db909dbcff7d2ff15c1cf0ec0b28 100644 (file)
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -6,6 +6,7 @@
 terse=
 graphviz=
 sort=
+deps=
 
 
 ## Parse options
@@ -19,22 +20,19 @@ while [ -n "$1" ]; do
                graphviz=1;;
        --sort)
                sort=1;;
+       --deps)
+               deps=1;;
        *)
-               echo "Usage: tg [...] summary [-t | --sort | --graphviz]" >&2
+               echo "Usage: tg [...] summary [-t | --sort | --deps | --graphviz]" >&2
                exit 1;;
        esac
 done
 
 curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 
-! [ -n "$terse" -a -n "$graphviz" ] ||
-       die "-t and --graphviz options are mutual exclusive"
-
-! [ -n "$sort" -a -n "$graphviz" ] ||
-       die "--sort and --graphviz options are mutual exclusive"
-
-! [ -n "$sort" -a -n "$terse" ] ||
-       die "-t and --sort options are mutual exclusive"
+[ "$terse$graphviz$sort$deps" = "" ] ||
+       [ "$terse$graphviz$sort$deps" = "1" ] ||
+       die "mutually exclusive options given"
 
 if [ -n "$graphviz" ]; then
        cat <<EOT
@@ -65,18 +63,57 @@ fi
 
 ## List branches
 
+process_branch()
+{
+       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=' '
+       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")" != "$rev" ]; then
+               subject="$(git cat-file blob "$name:.topmsg" | sed -n 's/^Subject: //p')"
+       else
+               # No commits yet
+               subject="(No commits)"
+       fi
+
+       printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+               "$name" "$subject"
+}
+
+if [ -n "$deps" ]; then
+       list_deps
+       exit 0
+fi
+
 git for-each-ref refs/top-bases |
        while read rev type ref; do
                name="${ref#refs/top-bases/}"
                if branch_annihilated "$name"; then
                        continue;
-               fi;
+               fi
 
                if [ -n "$terse" ]; then
                        echo "$name"
-                       continue
-               fi
-               if [ -n "$graphviz" ] || [ -n "$sort" ]; then
+               elif [ -n "$graphviz$sort" ]; then
                        git cat-file blob "$name:.topdeps" | while read dep; do
                                dep_is_tgish=true
                                ref_exists "refs/top-bases/$dep"  ||
@@ -84,46 +121,17 @@ git for-each-ref refs/top-bases |
                                if ! "$dep_is_tgish" || ! branch_annihilated $dep; then
                                        if [ -n "$graphviz" ]; then
                                                echo "\"$name\" -> \"$dep\";"
+                                               if [ "$name" = "$curname" ] || [ "$dep" = "$curname" ]; then
+                                                       echo "\"$curname\" [style=filled,fillcolor=yellow];"
+                                               fi
                                        else
                                                echo "$name $dep" >&4
                                        fi
                                fi
                        done
-                       continue
-               fi
-
-               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=' '
-               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")" != "$rev" ]; then
-                       subject="$(git cat-file blob "$name:.topmsg" | sed -n 's/^Subject: //p')"
                else
-                       # No commits yet
-                       subject="(No commits)"
+                       process_branch
                fi
-
-               printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
-                       "$name" "$subject"
        done
 
 if [ -n "$graphviz" ]; then