tg import: Construct actually proper .topmsg file

[topgit.git] / tg-summary.sh

diff --git a/tg-summary.sh b/tg-summary.sh
index bb71971aad2055c2d7d8388e59b4091dd9650256..3905bdce7dc1d934a7862c025c4fb772c52660d6 100644 (file)
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -3,13 +3,21 @@
 # (c) Petr Baudis <pasky@suse.cz>  2008
 # GPLv2
 
+terse=
+
 
 ## Parse options
 
-if [ -n "$1" ]; then
-       echo "Usage: tg summary" >&2
-       exit 1
-fi
+while [ -n "$1" ]; do
+       arg="$1"; shift
+       case "$arg" in
+       -t)
+               terse=1;;
+       *)
+               echo "Usage: tg [...] summary [-t]" >&2
+               exit 1;;
+       esac
+done
 
 curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 
@@ -19,6 +27,11 @@ curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 git for-each-ref refs/top-bases |
        while read rev type ref; do
                name="${ref#refs/top-bases/}"
+               if [ -n "$terse" ]; then
+                       echo "$name"
+                       continue
+               fi
+
                missing_deps=
 
                current=' '
@@ -29,11 +42,11 @@ git for-each-ref refs/top-bases |
                [ -z "$base_remote" ] || remote='l'
                ! has_remote "$name" || remote='r'
                rem_update=' '
-               [ "$remote" != 'r' ] || {
+               [ "$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" ||
+               [ "$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'