X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-depend.sh;h=474ccda4e098a2046a2e60a52d5addad4b007f81;hp=ff4541c5980df606ab293cb224867c00577f5f65;hb=26b3543d1fdb68247e69654c3c4cb759f04a4a15;hpb=4956e5734d10ac88fcca7276b402f1157644cb9b

diff --git a/tg-depend.sh b/tg-depend.sh
old mode 100755
new mode 100644
index ff4541c..474ccda
--- a/tg-depend.sh
+++ b/tg-depend.sh
@@ -6,13 +6,18 @@
 name=
 
 
+usage()
+{
+    echo "Usage: tg [...] depend add NAME" >&2
+    exit 1
+}
+
 ## Parse options
 
 subcmd="$1"; shift || :
 case "$subcmd" in
 	-h|"")
-		echo "Usage: tg [...] depend add NAME" >&2
-		exit 1;;
+		usage;;
 	add)
 		;;
 	*)
@@ -23,8 +28,7 @@ while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
 	-*)
-		echo "Usage: tg [...] depend add NAME" >&2
-		exit 1;;
+		usage;;
 	*)
 		[ -z "$name" ] || die "name already specified ($name)"
 		name="$arg";;
@@ -37,13 +41,31 @@ done
 [ -n "$name" ] || die "no branch name specified"
 branchrev="$(git rev-parse --verify "$name" 2>/dev/null)" ||
 	die "invalid branch name: $name"
-baserev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" ||
-	die "not a TopGit topic branch: $name"
 
+# Check that we are on a TopGit branch.
+current_name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
+current_base_rev="$(git rev-parse --short --verify "refs/top-bases/$current_name" 2>/dev/null)" ||
+	die "not a TopGit-controlled branch"
 
 ## Record new dependency
+depend_add()
+{
+	[ "$name" = "$current_name" ] &&
+		die "$name cannot depend on itself."
+
+	{ $tg summary --deps; echo "$current_name" "$name"; } |
+		tsort >/dev/null ||
+		die "tg: that dependency would introduce a dependency loop"
+
+	grep -F -x -e "$name" "$root_dir/.topdeps" >/dev/null &&
+		die "tg: $current_name already depends on $name"
+
+	echo "$name" >>"$root_dir/.topdeps"
+	git add -f "$root_dir/.topdeps"
+	git commit -m"New TopGit dependency: $name"
+	$tg update
+}
+
+depend_$subcmd
 
-echo "$name" >>"$root_dir/.topdeps"
-git add -f "$root_dir/.topdeps"
-git commit -m"New TopGit dependency: $name"
-$tg update
+# vim:noet