X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=3905bdce7dc1d934a7862c025c4fb772c52660d6;hp=1d679c44078587ee9ba3c267320ec66932b59f5d;hb=3051faceb5eb73f328a76d790a23fa7a9c71b427;hpb=ef028024666dde5fdc3afb8c348e75e2c37dd603

diff --git a/tg-summary.sh b/tg-summary.sh
index 1d679c4..3905bdc 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -3,13 +3,23 @@
 # (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\)/##')"
 
 
 ## List branches
@@ -17,18 +27,27 @@ fi
 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=' '
+		[ "$name" != "$curname" ] || current='>'
 		nonempty=' '
 		! branch_empty "$name" || nonempty='0'
 		remote=' '
 		[ -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" 2>/dev/null ||
+			rem_update='L'
 		deps_update=' '
 		needs_update "$name" >/dev/null || deps_update='D'
 		deps_missing=' '
@@ -43,6 +62,6 @@ git for-each-ref refs/top-bases |
 			subject="(No commits)"
 		fi
 
-		printf '%s\t%-31s\t%s\n' "$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+		printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
 			"$name" "$subject"
 	done