Merge commit 'index-wt~2' of git://repo.or.cz/topgit/bertw

[topgit.git] / tg-summary.sh

diff --git a/tg-summary.sh b/tg-summary.sh
index 32bb6976037ce28b1174a25a0dabe67af95f8b97..1c99e2225c61a2a4c9a07ec6bd64ee82558ddda7 100644 (file)
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -7,13 +7,16 @@ terse=
 graphviz=
 sort=
 deps=
-
+head_from=
 
 ## Parse options
 
 while [ -n "$1" ]; do
        arg="$1"; shift
        case "$arg" in
+       -i|-w)
+               [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+               head_from="$arg";;
        -t)
                terse=1;;
        --graphviz)
@@ -23,7 +26,7 @@ while [ -n "$1" ]; do
        --deps)
                deps=1;;
        *)
-               echo "Usage: tg [...] summary [-t | --sort | --deps | --graphviz]" >&2
+               echo "Usage: tg [...] summary [-t | --sort | --deps | --graphviz] [-i | -w]" >&2
                exit 1;;
        esac
 done
@@ -55,10 +58,9 @@ EOT
 fi
 
 if [ -n "$sort" ]; then
-       tsort_input=`mktemp`
+       tsort_input="$(get_temp tg-summary-sort)"
        exec 4>$tsort_input
        exec 5<$tsort_input
-       rm $tsort_input
 fi
 
 ## List branches
@@ -69,8 +71,11 @@ process_branch()
 
        current=' '
        [ "$name" != "$curname" ] || current='>'
+       from=$head_from
+       [ "$name" = "$curname" ] ||
+               from=
        nonempty=' '
-       ! branch_empty "$name" || nonempty='0'
+       ! branch_empty "$name" $from || nonempty='0'
        remote=' '
        [ -z "$base_remote" ] || remote='l'
        ! has_remote "$name" || remote='r'
@@ -89,7 +94,7 @@ process_branch()
        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')"
+               subject="$(cat_file "$name:.topmsg" $from | sed -n 's/^Subject: //p')"
        else
                # No commits yet
                subject="(No commits)"
@@ -99,36 +104,42 @@ process_branch()
                "$name" "$subject"
 }
 
+if [ -n "$deps" ]; then
+       list_deps $head_from
+       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$sort$deps" ]; then
-                       git cat-file blob "$name:.topdeps" | while read dep; do
+               elif [ -n "$graphviz$sort" ]; then
+                       from=$head_from
+                       [ "$name" = "$curname" ] ||
+                               from=
+                       cat_file "$name:.topdeps" $from | while read dep; do
                                dep_is_tgish=true
                                ref_exists "refs/top-bases/$dep"  ||
                                        dep_is_tgish=false
                                if ! "$dep_is_tgish" || ! branch_annihilated $dep; then
                                        if [ -n "$graphviz" ]; then
                                                echo "\"$name\" -> \"$dep\";"
-                                       elif [ -n "$deps" ]; 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
+               else
+                       process_branch
                fi
-
-               process_branch
        done
 
 if [ -n "$graphviz" ]; then