X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-gdr;h=22ea6d1fa88bab61758b410d47dcd3bf2951652b;hp=ac4a476ea3596ba34cd87f85c24b654a8c6d6889;hb=e33153606c256c3298879a108ccb33f8c2554a2d;hpb=fe0439371d17132ccb6b7a00f1ee57c0576e44fc

diff --git a/tests/lib-gdr b/tests/lib-gdr
index ac4a476e..22ea6d1f 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -18,19 +18,36 @@ t-gdr-good () {
 	# state should be one of
 	#   laundered
 	#   stitched
-	#   patches
+	#   pushed
 
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
-	local etype netype bwtip
+	local etypes bwtip
 
+	LC_MESSAGES=C t-git-debrebase status >../status.check
 	case $state in
 	laundered)
-			etype=Upstream
+		egrep '^  *branch is laundered' ../status.check
+		;;
+	stitched|pushed)
+		egrep \
+ '^  *branch contains furniture|^  *branch is unlaundered|^  *branch needs laundering' ../status.check
+		egrep '^  stitched$' ../status.check
+		;;
+	esac
+
+	# etypes is either a type,
+	# or   PseudoMerge-<more etypes>
+	# or   AddPatches-<more etypes>
+
+	case $state in
+	laundered)
+			etypes=Upstream
 			bwtip=Y:`t-git-debrebase breakwater`
 		;;
-	stitched)	etype=Pseudomerge ;;
-	pushed)		etype=AddPatches; netype=Pseudomerge ;;
+	stitched)	etypes=Pseudomerge-Upstream ;;
+	pushed)		etypes=AddPatches-Pseudomerge-Upstream ;;
+	pushed-interop)	etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
 	esac
 
 	t-git-debrebase analyse >../anal.check
@@ -40,8 +57,8 @@ t-gdr-good () {
 	while read cid ctype info; do
 		: ===== $cid $ctype $info =====
 		test $cid = $expect
-		local cetype=$etype
-		if [ "x$ctype" = "x$etype" ]; then cetype=SAME; fi
+		local cetype=${etypes%%-*}
+		if [ "x$ctype" = "x$cetype" ]; then cetype=SAME; fi
 		local parents="`git log -n1 --pretty=format:%P $cid`"
 		expect="$parents"
 		enparents=1
@@ -52,17 +69,18 @@ t-gdr-good () {
 		Packaging/SAME)				;;
 		Packaging/Upstream)			;;
 		AddPatches/SAME)			;;
+		AddPatches/AddPatchesInterop)		;;
 		Changelog/Packaging)			;;
 		Changelog/Upstream)			;;
 		Upstream/SAME)				;;
-		BreakwaterUpstreamMerge/Upstream)	;;
-		BreakwaterUpstreamMerge/Packaging)	;;
+		Anchor/Upstream)			;;
+		Anchor/Packaging)			;;
 		*)
-			fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
+			fail "etypes=$etypes ctype=$ctype cetype=$cetype $cid"
 			;;
 		esac
 
-		case "$ctype/$etype" in
+		case "$ctype/$etypes" in
 		Packaging/Upstream|\
 		Changelog/Upstream)
 			if [ "x$bwtip" != x ]; then
@@ -71,34 +89,50 @@ t-gdr-good () {
 			fi
 		esac
 
+		case "$cetype" in
+		AddPatchesInterop)
+			git log -n1 --pretty=format:%B \
+			| grep '^\[git-debrebase[ :]'
+			;;
+		esac
+
 		case "$ctype" in
 		Pseudomerge)
 			expect=${info#Contributor=}
 			expect=${expect%% *}
 			enparents=2
 			git diff --quiet $expect..$cid
-			etype=Upstream
+			etypes=${etypes#*-}
+
+			: 'reject pointless pseudomerges'
+			local overwritten=${parents/$expect/}
+			overwritten=${overwritten// /}
+			t-git-debrebase analyse $overwritten >../anal.overwr
+			local ocid otype oinfo
+			read <../anal.overwr ocid otype oinfo
+			case "$otype" in
+			Pseudomerge) test "x$info" != "x$oinfo" ;;
+			esac
 			;;
 		Packaging)
 			git diff --quiet $expect..$cid -- ':.' ':!debian' 
 			git diff --quiet $expect..$cid -- ':debian/patches'
-			etype=Packaging
+			etypes=Packaging
 			;;
 		AddPatches)
 			git diff --quiet $expect..$cid -- \
 				':.' ':!debian/patches'
-			etype=$netype
-			netype=Upstream
+			etypes=${etypes#*-}
 			;;
 		Changelog)
 			git diff --quiet $expect..$cid -- \
 				':.' ':!debian/changelog'
-			etype=Packaging
+			etypes=Packaging
 			;;
 		Upstream/SAME)
 			git diff --quiet $expect..$cid -- ':debian'
 			;;
-		BreakwaterUpstreamMerge)
+		Anchor)
 			break
 			;;
 		esac
@@ -106,6 +140,11 @@ t-gdr-good () {
 		local cnparents=`printf "%s" "$parents" | wc -w`
 		test $cnparents = $enparents
 
+		local cndparents=`
+	for f in $parents; do echo $f; done | t-sort -u | wc -w
+				`
+		test $cndparents = $cnparents
+
 		case "$parents" in
 		*"$expect"*)	;;
 		*)		fail 'unexpected parent' ;;
@@ -116,21 +155,34 @@ t-gdr-good () {
 
 t-some-changes () {
 	local token=$1
+	local which=${2-dum}
 
 	t-git-next-date
 
-	echo >>debian/zorkmid "// debian $token"
-	git add debian/zorkmid
-	git commit -m "DEBIAN add zorkmid ($token)"
+	case "$which" in
+	*d*)
+		echo >>debian/zorkmid "// debian $token"
+		git add debian/zorkmid
+		git commit -m "DEBIAN add zorkmid ($token)"
+		;;
+	esac
 
-	echo >>src.c "// upstream $token"
-	git commit -a -m "UPSTREAM edit src.c ($token)"
+	case "$which" in
+	*u*)
+		echo >>src.c "// upstream $token"
+		git commit -a -m "UPSTREAM edit src.c ($token)"
+		;;
+	esac
 
-	for f in debian/zorkmid src.c; do
-		echo "// both! $token" >>$f
-		git add $f
-	done
-	git commit -m "MIXED add both ($token)"
+	case "$which" in
+	*m*)
+		for f in debian/zorkmid src.c; do
+			echo "// both! $token" >>$f
+			git add $f
+		done
+		git commit -m "MIXED add both ($token)"
+		;;
+	esac
 
 	t-git-next-date
 }
@@ -204,8 +256,13 @@ t-maintainer-commit-some-changes () {
 }
 
 t-nmu-causes-ff-fail () {
+	t-dgit fetch
+
 	t-expect-fail E:'Not.*fast-forward' \
 	git merge --ff-only dgit/dgit/sid
+
+	t-expect-fail E:'-fdiverged.*refs/remotes/dgit/dgit/sid' \
+	t-git-debrebase
 }
 
 t-nmu-reconciled-good () {