X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=tg-summary.sh;h=32bb6976037ce28b1174a25a0dabe67af95f8b97;hb=9404aa1ac356646adf93d1761263031efa570dc5;hp=50ee8832090c6646c9bd114d6f5926657dcc07db;hpb=4fe0a8e009776b8c66357f08ef8171bdc2c0f468;p=topgit.git

diff --git a/tg-summary.sh b/tg-summary.sh
index 50ee883..32bb697 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -5,6 +5,8 @@
 
 terse=
 graphviz=
+sort=
+deps=
 
 
 ## Parse options
@@ -16,16 +18,21 @@ while [ -n "$1" ]; do
 		terse=1;;
 	--graphviz)
 		graphviz=1;;
+	--sort)
+		sort=1;;
+	--deps)
+		deps=1;;
 	*)
-		echo "Usage: tg [...] summary [-t | --graphviz]" >&2
+		echo "Usage: tg [...] summary [-t | --sort | --deps | --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"
+[ "$terse$graphviz$sort$deps" = "" ] ||
+	[ "$terse$graphviz$sort$deps" = "1" ] ||
+	die "mutually exclusive options given"
 
 if [ -n "$graphviz" ]; then
 	cat <<EOT
@@ -47,9 +54,51 @@ graph [
 EOT
 fi
 
+if [ -n "$sort" ]; then
+	tsort_input=`mktemp`
+	exec 4>$tsort_input
+	exec 5<$tsort_input
+	rm $tsort_input
+fi
 
 ## List branches
 
+process_branch()
+{
+	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=' '
+	[ -z "$missing_deps" ] || deps_missing='!'
+	base_update=' '
+	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')"
+	else
+		# No commits yet
+		subject="(No commits)"
+	fi
+
+	printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+		"$name" "$subject"
+}
+
 git for-each-ref refs/top-bases |
 	while read rev type ref; do
 		name="${ref#refs/top-bases/}"
@@ -61,54 +110,34 @@ git for-each-ref refs/top-bases |
 			echo "$name"
 			continue
 		fi
-		if [ -n "$graphviz" ]; then
+		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
-					echo "\"$name\" -> \"$dep\";"
+					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=' '
-		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")" != "$rev" ]; then
-			subject="$(git cat-file blob "$name:.topmsg" | sed -n 's/^Subject: //p')"
-		else
-			# No commits yet
-			subject="(No commits)"
-		fi
-
-		printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
-			"$name" "$subject"
+		process_branch
 	done
 
 if [ -n "$graphviz" ]; then
 	echo '}'
 fi
 
+if [ -n "$sort" ]; then
+	tsort <&5
+fi
+
+
 # vim:noet