X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=50ee8832090c6646c9bd114d6f5926657dcc07db;hp=f9d8985d7f6559e3a4d8ae15631ab41c70c82ee5;hb=82f304a9d9a72111fde3127b15537f67df1d6612;hpb=42827be6e6afeafda405049ca319a16ef2089841

diff --git a/tg-summary.sh b/tg-summary.sh
index f9d8985..50ee883 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -3,24 +3,92 @@
 # (c) Petr Baudis <pasky@suse.cz>  2008
 # GPLv2
 
+terse=
+graphviz=
+
 
 ## Parse options
 
-if [ -n "$1" ]; then
-	echo "Usage: tg summary" >&2
-	exit 1
+while [ -n "$1" ]; do
+	arg="$1"; shift
+	case "$arg" in
+	-t)
+		terse=1;;
+	--graphviz)
+		graphviz=1;;
+	*)
+		echo "Usage: tg [...] summary [-t | --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"
+
+if [ -n "$graphviz" ]; then
+	cat <<EOT
+# GraphViz output; pipe to:
+#   | dot -Tpng -o <ouput>
+# or
+#   | dot -Txlib
+
+digraph G {
+
+graph [
+  rankdir = "TB"
+  label="TopGit Layout\n\n\n"
+  fontsize = 14
+  labelloc=top
+  pad = "0.5,0.5"
+];
+
+EOT
 fi
 
 
 ## List branches
 
 git for-each-ref refs/top-bases |
-	while read rev name ref; do
+	while read rev type ref; do
 		name="${ref#refs/top-bases/}"
+		if branch_annihilated "$name"; then
+			continue;
+		fi;
+
+		if [ -n "$terse" ]; then
+			echo "$name"
+			continue
+		fi
+		if [ -n "$graphviz" ]; then
+			git cat-file blob "$name:.topdeps" | 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
+					echo "\"$name\" -> \"$dep\";"
+				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=' '
@@ -35,6 +103,12 @@ git for-each-ref refs/top-bases |
 			subject="(No commits)"
 		fi
 
-		printf '%s%s%s%s\t%-31s\t%s\n' "$nonempty" "$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
+
+if [ -n "$graphviz" ]; then
+	echo '}'
+fi
+
+# vim:noet