X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-gdr;h=cda11df5b8d5fe7d322d9f8f8168cc44c2554746;hp=6c744657b6e270c86655aee777d822cdc031a695;hb=4fb9b340d818b131457079f24c500a5f325977af;hpb=b62c158368158b278bcb31447f8b1442cb531898

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 6c744657..cda11df5 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -3,6 +3,8 @@
 : ${GDR_TEST_DEBUG=-D}
 export GDR_TEST_DEBUG
 
+t-tstunt debchange
+
 t-git-debrebase () {
 	local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
 	: '
@@ -21,14 +23,20 @@ t-gdr-good () {
 	#   stitched
 	#   pushed
 
+	case $state in
+	pushed*)
+		t-gdr-made-patches
+		;;
+	esac
+
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
 	LC_MESSAGES=C t-git-debrebase status >../status.check
 	case $state in
-	laundered)
+	laundered*)
 		egrep '^  *branch is laundered' ../status.check
 		;;
-	stitched|pushed)
+	stitched*|pushed*)
 		egrep \
  '^  *branch contains furniture|^  *branch is unlaundered|^  *branch needs laundering' ../status.check
 		egrep '^  stitched$' ../status.check
@@ -56,6 +64,8 @@ t-gdr-good-analyse () {
 	stitched)	etypes=Pseudomerge-Upstream ;;
 	pushed)		etypes=AddPatches-Pseudomerge-Upstream ;;
 	pushed-interop)	etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
+	breakwater)	etypes=Packaging ;;
+	*)		fail-unknown-state-$state ;;
 	esac
 
 	anal=../anal$wsfx
@@ -77,6 +87,8 @@ t-gdr-good-analyse () {
 		Pseudomerge/SAME)			;;
 		Packaging/SAME)				;;
 		Packaging/Upstream)			;;
+		MergedBreakwaters/Packaging)		;;
+		MergedBreakwaters/Upstream)		;;
 		AddPatches/SAME)			;;
 		AddPatches/AddPatchesInterop)		;;
 		Changelog/Packaging)			;;
@@ -141,6 +153,9 @@ t-gdr-good-analyse () {
 		Upstream/SAME)
 			git diff --quiet $expect..$cid -- ':debian'
 			;;
+		MergedBreakwaters)
+			enparents=2
+			;;
 		Anchor)
 			break
 			;;
@@ -159,6 +174,19 @@ t-gdr-good-analyse () {
 		*)		fail 'unexpected parent' ;;
 		esac
 
+		case "$ctype" in
+		MergedBreakwaters)
+			local f
+			local parent_ix=0
+			for f in $parents; do
+				t-gdr-good-analyse $f breakwater \
+					$wsfx-mp$parent_ix
+				parent_ix=$(( $parent_ix + 1 ))
+			done
+			return
+			;;
+		esac		
+
 	done
 }
 
@@ -201,11 +229,9 @@ t-some-changes () {
 t-make-new-upstream-tarball () {
 	local uv=$1
 	git checkout make-upstream
-	# leaves ust set to filename of orig tarball
 	echo "upstream $uv" >>docs/README
 	git commit -a -m "upstream $uv tarball"
-	ust=example_$uv.orig.tar.gz
-	git archive -o ../$ust --prefix=example-2.0/ make-upstream
+	t-make-orig example $uv make-upstream
 }
 
 t-nmu-upload-1 () {
@@ -310,3 +336,42 @@ t-gdr-prep-new-upstream () {
 	git checkout master
 	t-git-next-date
 }
+
+t-gdr-gbp-import-core () {
+	p=example
+	t-worktree 1.1
+
+	cd example
+
+	: 'fake up some kind of upstream'
+	git checkout -b upstream quilt-tip
+	rm -rf debian
+	mkdir debian
+	echo junk >debian/rules
+	git add debian
+	git commit -m "an upstream retcon ($0)"
+	git tag v1.0
+}
+
+t-gdr-gbp-import-core-with-queue () {
+	t-gdr-gbp-import-core
+
+	: 'fake up that our quilt-tip was descended from upstream'
+	git checkout quilt-tip
+	git merge --no-edit -s ours upstream
+
+	: 'fake up that our quilt-tip had the patch queue in it'
+	git checkout patch-queue/quilt-tip
+	gbp pq export
+	git add debian/patches
+	git commit -m "patch queue update ($0)"
+
+	: 'make branch names more conventional'
+	git branch -D master
+	git branch -m quilt-tip master
+}
+
+t-gdr-made-patches () {
+	git log -n1 --'pretty=format:%B' \
+	| egrep '^\[git-debrebase'
+}