X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=c80dead656ade953a80a2c8ef836a50c15a3bc09;hb=b95109f18261edb47dda96bfd160fb2b79e39a41;hp=aeb7725411eb20038eb307b525644defb7f3f77d;hpb=3e41667e778dfcaa191516b24e49aff99d096ec1;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index aeb77254..c80dead6 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -18,7 +18,7 @@ t-gdr-good () {
 	# state should be one of
 	#   laundered
 	#   stitched
-	#   patches
+	#   pushed
 
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
@@ -55,8 +55,8 @@ t-gdr-good () {
 		Changelog/Packaging)			;;
 		Changelog/Upstream)			;;
 		Upstream/SAME)				;;
-		BreakwaterUpstreamMerge/Upstream)	;;
-		BreakwaterUpstreamMerge/Packaging)	;;
+		Anchor/Upstream)			;;
+		Anchor/Packaging)			;;
 		*)
 			fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
 			;;
@@ -78,6 +78,16 @@ t-gdr-good () {
 			enparents=2
 			git diff --quiet $expect..$cid
 			etype=Upstream
+
+			: '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' 
@@ -98,7 +108,7 @@ t-gdr-good () {
 		Upstream/SAME)
 			git diff --quiet $expect..$cid -- ':debian'
 			;;
-		BreakwaterUpstreamMerge)
+		Anchor)
 			break
 			;;
 		esac
@@ -106,6 +116,11 @@ t-gdr-good () {
 		local cnparents=`printf "%s" "$parents" | wc -w`
 		test $cnparents = $enparents
 
+		local cndparents=`
+	for f in $parents; do echo $f; done | sort -u | wc -w
+				`
+		test $cndparents = $cnparents
+
 		case "$parents" in
 		*"$expect"*)	;;
 		*)		fail 'unexpected parent' ;;
@@ -117,6 +132,8 @@ t-gdr-good () {
 t-some-changes () {
 	local token=$1
 
+	t-git-next-date
+
 	echo >>debian/zorkmid "// debian $token"
 	git add debian/zorkmid
 	git commit -m "DEBIAN add zorkmid ($token)"
@@ -129,6 +146,8 @@ t-some-changes () {
 		git add $f
 	done
 	git commit -m "MIXED add both ($token)"
+
+	t-git-next-date
 }
 
 t-make-new-upstream-tarball () {
@@ -140,3 +159,95 @@ t-make-new-upstream-tarball () {
 	ust=example_$uv.orig.tar.gz
 	git archive -o ../$ust --prefix=example-2.0/ make-upstream
 }
+
+t-nmu-upload-1 () {
+	# usage:
+	#  v=<full version>
+	#  nmu-upload-1 <nmubranch>
+	#  gbp pq import or perhaps other similar things
+	#  nmu-upload-2
+	#  maybe make some dgit-covertible commits
+	#  nmu-upload-3
+
+	t-git-next-date
+	nmubranch=$1
+	git checkout -f -b $nmubranch
+	t-git-debrebase
+	t-git-debrebase convert-to-gbp
+	t-git-next-date
+	# now we are on a gbp patched-unapplied branch
+}
+
+
+t-nmu-upload-2 () {
+	t-git-next-date
+	t-dch-commit -v $v -m "nmu $nmubranch $v"
+}
+
+t-nmu-upload-3 () {
+	t-dch-commit -r sid
+
+	t-dgit -wgf build-source
+
+	cd ..
+	c=${p}_${v}_source.changes
+	debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+	dput -c $tmp/dput.cf test-dummy $c
+
+	t-archive-process-incoming sid
+	t-git-next-date
+	cd $p
+	git checkout master
+}
+
+t-nmu-commit-an-upstream-change () {
+	echo >>newsrc.c "// more upstream"
+	git add newsrc.c
+	git commit -m 'UPSTREAM NMU'
+}
+
+t-maintainer-commit-some-changes () {
+	t-dch-commit -v$v -m "start $v"
+
+	t-some-changes "maintainer $v"
+	t-git-debrebase
+	t-git-debrebase stitch
+
+	git branch did.maintainer
+
+	t-git-next-date
+}
+
+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 () {
+	local nmutree=$1
+
+	: 'check that what we have is what is expected'
+
+	git checkout -b compare.nmu origin/master~0
+	git checkout $nmutree .
+	git rm -rf debian/patches
+	git commit -m 'rm patches nmu'
+
+	git checkout -b compare.maintainer origin/master~0
+	git checkout did.maintainer .
+	git rm -rf --ignore-unmatch debian/patches
+	git commit --allow-empty -m 'rm patches maintainer'
+
+	git merge compare.nmu
+	git diff --quiet master
+
+	: 'check that dgit still likes it'
+
+	git checkout master
+	t-dgit -wgf quilt-fixup
+}