'
}
-t-gdr-branch-structure () {
+t-gdr-good () {
local state=$1
+ local beforetag=$2 # say HEAD to skip this check
# state should be one of
# laundered
# stitched
# patches
- local etype netype
+ git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
+
+ local etype netype bwtip
case $state in
- laundered) etype=Upstream ;;
+ laundered)
+ etype=Upstream
+ bwtip=Y:`t-git-debrebase breakwater`
+ ;;
stitched) etype=Pseudomerge ;;
pushed) etype=AddPatches; netype=Pseudomerge ;;
esac
expect="$parents"
enparents=1
: "$ctype/$cetype" "$parents"
+
case "$ctype/$cetype" in
- Pseudomerge/SAME)
+ Pseudomerge/SAME) ;;
+ Packaging/SAME) ;;
+ Packaging/Upstream) ;;
+ AddPatches/SAME) ;;
+ Changelog/Packaging) ;;
+ Changelog/Upstream) ;;
+ Upstream/SAME) ;;
+ BreakwaterUpstreamMerge/Upstream) ;;
+ BreakwaterUpstreamMerge/Packaging) ;;
+ *)
+ fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
+ ;;
+ esac
+
+ case "$ctype/$etype" in
+ Packaging/Upstream|\
+ Changelog/Upstream)
+ if [ "x$bwtip" != x ]; then
+ test "$bwtip" = "Y:$cid"
+ bwtip=''
+ fi
+ esac
+
+ case "$ctype" in
+ Pseudomerge)
expect=${info#Contributor=}
expect=${expect%% *}
enparents=2
git diff --quiet $expect..$cid
etype=Upstream
;;
- Packaging/SAME|\
- Packaging/Upstream)
+ Packaging)
git diff --quiet $expect..$cid -- ':.' ':!debian'
git diff --quiet $expect..$cid -- ':debian/patches'
etype=Packaging
;;
- AddPatches/SAME)
+ AddPatches)
git diff --quiet $expect..$cid -- \
':.' ':!debian/patches'
etype=$netype
netype=Upstream
;;
- Changelog/Packaging|\
- Changelog/Upstream)
+ Changelog)
git diff --quiet $expect..$cid -- \
':.' ':!debian/changelog'
etype=Packaging
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
- BreakwaterUpstreamMerge/Upstream| \
- BreakwaterUpstreamMerge/Packaging)
+ BreakwaterUpstreamMerge)
break
;;
- *)
- fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
- ;;
esac
local cnparents=`printf "%s" "$parents" | wc -w`
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)"
git add $f
done
git commit -m "MIXED add both ($token)"
+
+ t-git-next-date
+}
+
+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-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
}