X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=a92480ff38f0f13444909c5d3895ae2543b7765e;hp=a1f8366ba26f75a35afd59a5a3fb4fa052eb5366;hb=5aed7e7bad8c23080139b452adac75d2571b6dfa;hpb=f6f5bcebd1c8833a0126253f21c330b73b77bad0

diff --git a/tg-summary.sh b/tg-summary.sh
index a1f8366..a92480f 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -3,34 +3,136 @@
 # (c) Petr Baudis <pasky@suse.cz>  2008
 # GPLv2
 
+terse=
+graphviz=
+sort=
+deps=
+
 
 ## 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;;
+	--sort)
+		sort=1;;
+	--deps)
+		deps=1;;
+	*)
+		echo "Usage: tg [...] summary [-t | --sort | --deps | --graphviz]" >&2
+		exit 1;;
+	esac
+done
+
+curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
+
+[ "$terse$graphviz$sort$deps" = "" ] ||
+	[ "$terse$graphviz$sort$deps" = "1" ] ||
+	die "mutually exclusive options given"
+
+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
 
+if [ -n "$sort" ]; then
+	tsort_input=`mktemp`
+	exec 4>$tsort_input
+	exec 5<$tsort_input
+	rm $tsort_input
+fi
 
 ## List branches
 
-git for-each-ref refs/heads | cut -f 2 |
-	while read ref; do
-		name="${ref#refs/heads/}"
-		base_rev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" ||
-			continue # not a TopGit branch
+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;
+
+		if [ -n "$terse" ]; then
+			echo "$name"
+			continue
+		fi
+		if [ -n "$graphviz$sort$deps" ]; 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
+					if [ -n "$graphviz" ]; then
+						echo "\"$name\" -> \"$dep\";"
+					elif [ -n "$deps" ]; then
+						echo "$name $dep"
+					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=' '
-		[ -z "$(needs_update "$name")" ] || deps_update='D'
+		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")" != "$base_rev" ]; then
+		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%s\t%-31s\t%s\n' "$deps_update" "$base_update" "$name" "$subject"
+		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
+
+if [ -n "$sort" ]; then
+	tsort <&5
+fi
+
+
+# vim:noet