X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=1c99e2225c61a2a4c9a07ec6bd64ee82558ddda7;hp=870fcf4ddbfe9b988b5d2e35822558ff961fcda4;hb=6a1c58e7652027c584b14cd0037ad5eee8851e5c;hpb=c4c57a55aa1b825109f0ce0547994ad394812902

diff --git a/tg-summary.sh b/tg-summary.sh
index 870fcf4..1c99e22 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -5,25 +5,38 @@
 
 terse=
 graphviz=
-
+sort=
+deps=
+head_from=
 
 ## Parse options
 
 while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
+	-i|-w)
+		[ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+		head_from="$arg";;
 	-t)
 		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] [-i | -w]" >&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:
@@ -44,59 +57,98 @@ graph [
 EOT
 fi
 
+if [ -n "$sort" ]; then
+	tsort_input="$(get_temp tg-summary-sort)"
+	exec 4>$tsort_input
+	exec 5<$tsort_input
+fi
 
 ## List branches
 
+process_branch()
+{
+	missing_deps=
+
+	current=' '
+	[ "$name" != "$curname" ] || current='>'
+	from=$head_from
+	[ "$name" = "$curname" ] ||
+		from=
+	nonempty=' '
+	! branch_empty "$name" $from || 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="$(cat_file "$name:.topmsg" $from | 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"
+}
+
+if [ -n "$deps" ]; then
+	list_deps $head_from
+	exit 0
+fi
+
 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" ]; then
-			git cat-file blob "$name:.topdeps" | while read dep; do
-				echo "\"$name\" -> \"$dep\";"
+		elif [ -n "$graphviz$sort" ]; then
+			from=$head_from
+			[ "$name" = "$curname" ] ||
+				from=
+			cat_file "$name:.topdeps" $from | 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\";"
+						if [ "$name" = "$curname" ] || [ "$dep" = "$curname" ]; then
+							echo "\"$curname\" [style=filled,fillcolor=yellow];"
+						fi
+					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)"
+			process_branch
 		fi
-
-		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