X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=fb58bf9c08a1556d4297acc0af99e64c8a52bc6d;hb=672a73e53175a1b382307426912b03bbca8ce19c;hp=4e08ff7ee8e8496e918de21f04cdfdbb8657dfeb;hpb=45ace76a1b71342da5919dc0321e7f0f142b2615;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 4e08ff7e..fb58bf9c 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -11,3 +11,72 @@ t-git-debrebase () {
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
+
+t-gdr-branch-structure () {
+	local state=$1
+	# state should be one of
+	#   laundered
+	#   stitched
+	#   patches
+
+	case $state in
+	laundered)	etype=Upstream	;;
+	stitched)	etype=Pseudomerge ;;
+	patches)	etype=XXX-TODO ;;
+	esac
+
+	t-git-debrebase analyse >../anal.check
+	expect=`git rev-parse HEAD`
+	exec <../anal.check
+	local cid ctype info nparents
+	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 parents="`git log -n1 --pretty=format:%P $cid`"
+		expect="$parents"
+		enparents=1
+		: "$ctype/$cetype" "$parents"
+		case "$ctype/$cetype" in
+		Pseudomerge/SAME)
+			expect=${info#Contributor=}
+			expect=${expect%% *}
+			enparents=2
+			git diff --quiet $expect..$cid
+			etype=Upstream
+			;;
+		Packaging/SAME|\
+		Packaging/Upstream)
+			git diff --quiet $expect..$cid -- ':.' ':!debian' 
+			git diff --quiet $expect..$cid -- ':debian/patches'
+			etype=Packaging
+			;;
+		Changelog/Packaging|\
+		Changelog/Upstream)
+			git diff --quiet $expect..$cid -- \
+				':.' ':!debian/changelog'
+			etype=Packaging
+			;;
+		Upstream/SAME)
+			git diff --quiet $expect..$cid -- ':debian'
+			;;
+		BreakwaterUpstreamMerge/Upstream| \
+		BreakwaterUpstreamMerge/Packaging)
+			break
+			;;
+		*)
+			fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
+			;;
+		esac
+
+		local cnparents=`printf "%s" "$parents" | wc -w`
+		test $cnparents = $enparents
+
+		case "$parents" in
+		*"$expect"*)	;;
+		*)		fail 'unexpected parent' ;;
+		esac
+
+	done
+}