X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg.sh;h=2961106f735402d695043f31b32ffdef298566b3;hp=a844b5ed2828a27d8018955913474bb5274040ed;hb=a5dbc6a4a9e01c4e3b21b4c882acfd479c703a40;hpb=074eb3f1b432d95880fcc2c5b388bebac75046e9;ds=sidebyside

diff --git a/tg.sh b/tg.sh
index a844b5e..2961106 100644
--- a/tg.sh
+++ b/tg.sh
@@ -20,13 +20,13 @@ die()
 # setup_hook NAME
 setup_hook()
 {
-	hook_call="\"\$(tg --hooks-path)\"/$1 \"\$@\""
+	hook_call="\"\$($tg --hooks-path)\"/$1 \"\$@\""
 	if [ -f "$git_dir/hooks/$1" ] &&
 	   fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
 		# Another job well done!
 		return
 	fi
-	# Prepare incanation
+	# Prepare incantation
 	if [ -x "$git_dir/hooks/$1" ]; then
 		hook_call="$hook_call"' || exit $?'
 	else
@@ -47,8 +47,8 @@ setup_ours()
 {
 	if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
 		{
-			echo -e ".topmsg\tmerge=ours"
-			echo -e ".topdeps\tmerge=ours"
+			echo ".topmsg	merge=ours"
+			echo ".topdeps	merge=ours"
 		} >>"$git_dir/info/attributes"
 	fi
 	if ! git config merge.ours.driver >/dev/null; then
@@ -77,7 +77,21 @@ measure_branch()
 # Whether B1 is a superset of B2.
 branch_contains()
 {
-	[ -z "$(git rev-list ^"$1" "$2")" ]
+	[ -z "$(git rev-list ^"$1" "$2" --)" ]
+}
+
+# ref_exists REF
+# Whether REF is a valid ref name
+ref_exists()
+{
+	git rev-parse --verify "$@" >/dev/null 2>&1
+}
+
+# has_remote BRANCH
+# Whether BRANCH has a remote equivalent (accepts top-bases/ too)
+has_remote()
+{
+	[ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
 }
 
 # recurse_deps CMD NAME [BRANCHPATH...]
@@ -95,18 +109,25 @@ recurse_deps()
 	_cmd="$1"; shift
 	_name="$1"; # no shift
 	_depchain="$*"
-	_depsfile="$(mktemp)"
-	git cat-file blob "$_name:.topdeps" >"$_depsfile"
+
+	_depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
+	# Check also our base against remote base. Checking our head
+	# against remote head has to be done in the helper.
+	if has_remote "top-bases/$_name"; then
+		echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
+	fi
+	git cat-file blob "$_name:.topdeps" >>"$_depsfile"
+
 	_ret=0
 	while read _dep; do
-		if ! git rev-parse --verify "$_dep" >/dev/null 2>&1; then
+		if ! ref_exists "$_dep" ; then
 			# All hope is lost
 			missing_deps="$missing_deps $_dep"
 			continue
 		fi
 
 		_dep_is_tgish=1
-		git rev-parse --verify "refs/top-bases/$_dep" >/dev/null 2>&1 ||
+		ref_exists "refs/top-bases/$_dep"  ||
 			_dep_is_tgish=
 
 		# Shoo shoo, keep our environment alone!
@@ -130,14 +151,19 @@ recurse_deps()
 # description for details) and set $_ret to non-zero.
 branch_needs_update()
 {
-	_dep_base_uptodate=1
+	_dep_base_update=
 	if [ -n "$_dep_is_tgish" ]; then
-		branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_uptodate=
+		if has_remote "$_dep"; then
+			branch_contains "$_dep" "refs/remotes/$base_remote/$_dep" || _dep_base_update=%
+		fi
+		# This can possibly override the remote check result;
+		# we want to sync with our base first
+		branch_contains "$_dep" "refs/top-bases/$_dep" || _dep_base_update=:
 	fi
 
-	if [ -z "$_dep_base_uptodate" ]; then
-		# _dep needs to be synced with its base
-		echo ": $_dep $_depchain"
+	if [ -n "$_dep_base_update" ]; then
+		# _dep needs to be synced with its base/remote
+		echo "$_dep_base_update $_dep $_depchain"
 		_ret=1
 	elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
 		# Some new commits in _dep
@@ -150,7 +176,8 @@ branch_needs_update()
 # This function is recursive; it outputs reverse path from NAME
 # to the branch (e.g. B_DIRTY B1 B2 NAME), one path per line,
 # inner paths first. Innermost name can be ':' if the head is
-# not in sync with the base.
+# not in sync with the base or '%' if the head is not in sync
+# with the remote (in this order of priority).
 # It will also return non-zero status if NAME needs update.
 # If needs_update() hits missing dependencies, it will append
 # them to space-separated $missing_deps list and skip them.
@@ -195,10 +222,14 @@ do_help()
 			sep="|"
 		done
 
-		echo "TopGit v0.1 - A different patch queue manager"
-		echo "Usage: tg ($cmds|help) ..."
-	elif [ -r "@sharedir@/tg-$1.txt" ] ; then
-		cat "@sharedir@/tg-$1.txt"
+		echo "TopGit v0.5 - A different patch queue manager"
+		echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
+	elif [ -r "@cmddir@"/tg-$1 ] ; then
+		@cmddir@/tg-$1 -h || :
+		echo
+		if [ -r "@sharedir@/tg-$1.txt" ] ; then
+			cat "@sharedir@/tg-$1.txt"
+		fi
 	else
 		echo "`basename $0`: no help for $1" 1>&2
 	fi
@@ -210,6 +241,10 @@ do_help()
 set -e
 git_dir="$(git rev-parse --git-dir)"
 root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
+# Make sure root_dir doesn't end with a trailing slash.
+root_dir="${root_dir%/}"
+base_remote="$(git config topgit.remote 2>/dev/null)" || :
+tg="tg"
 # make sure merging the .top* files will always behave sanely
 setup_ours
 setup_hook "pre-commit"
@@ -223,6 +258,11 @@ setup_hook "pre-commit"
 # this is set by hooks.
 [ -z "$tg__include" ] || return 0
 
+if [ "$1" = "-r" ]; then
+	shift; base_remote="$1"; shift
+	tg="$tg -r $base_remote"
+fi
+
 cmd="$1"
 [ -n "$cmd" ] || die "He took a duck in the face at two hundred and fifty knots"
 shift