ln $troot/ssh ssh
mkdir $tmp/gnupg
+cp $troot/gnupg/* $tmp/gnupg
+chmod go-rw $tmp/gnupg/*
export GNUPGHOME=$tmp/gnupg
+mkdir $tmp/incoming
+cat <<END >$tmp/dput.cf
+[test-dummy]
+method = local
+incoming = $tmp/incoming
+run_dinstall = 0
+END
+
+t-worktree () {
+ rm -rf $p
+ tar xf $troot/worktrees/${p}_$1.tar
+}
+
t-git () {
+ p=$1
+ v=$2
mkdir -p $tmp/git
- cp -al $troot/git-srcs/$1 git/.
+ (set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
}
t-git-none () {
mkdir -p $tmp/git
+ (set -e; cd $tmp/git; tar xf $troot/git-template.tar)
}
-t-archive () {
+t-has-ancestor () {
+ local now=`git rev-parse HEAD`
+ local ancestor=`git rev-parse $1^{}`
+ local mbase=`git merge-base $ancestor $now`
+ if [ x$mbase != x$ancestor ]; then
+ echo "not ff $ancestor..$now, $mbase != $ancestor"
+ exit 1
+ fi
+}
+
+t-archive-none () {
p=$1
- v=$2
mkdir -p $tmp/aq $tmp/mirror
+ echo sid >$tmp/aq/suite.unstable
+}
+
+t-archive () {
+ t-archive-none $1
+ v=$2
local dscf=${p}_$2.dsc
rm -f $tmp/mirror/${p}_*
ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
- echo sid >$tmp/aq/suite.unstable
echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
rm -rf $tmp/extract
mkdir $tmp/extract
t-dgit () {
: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
- ${DGIT_TEST-dgit} --dget:-u -dtest-dummy -D "$@"
+ ${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
+ -dtest-dummy -D -k39B13D8A "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
}
t-cloned-fetched-good () {
t-diff-nogit ../extract/$p-${v%-*} .
t-clean-on-branch dgit/sid
- t-refs-same HEAD remotes/dgit/dgit/sid
+ t-refs-same \
+ refs/heads/dgit/sid \
+ refs/remotes/dgit/dgit/sid
+ t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
}
t-output () {
t-output "## $1" git status -b --porcelain
}
+t-git-get-ref () {
+ local ref=$1
+ git show-ref -d $1 | perl -ne '
+ $x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
+ END { print "$x\n" if length $x; }
+ '
+}
+
t-refs-same () {
local f=$1
- git rev-parse $f >$tmp/t.ref1
+ t-git-get-ref $f >$tmp/t.ref1
+ t-refs-same-more "$@"
+}
+
+t-refs-same-more () {
local g
for g in $*; do
- git rev-parse $g >$tmp/t.refn
+ t-git-get-ref $g >$tmp/t.refn
diff $tmp/t.ref1 $tmp/t.refn
done
}
+
+t-refs-notexist () {
+ for g in $*; do
+ t-git-get-ref $g >$tmp/t.refx
+ diff /dev/null $tmp/t.refx
+ done
+}
+
+t-v-tag () {
+ echo refs/tags/debian/${v//\~/_}
+}
+
+t-pushed-good () {
+ local branch=$1
+ t-ref-dsc-dgit
+ t-refs-same-more \
+ refs/heads/$branch \
+ `t-v-tag` \
+ refs/remotes/dgit/dgit/sid
+ t-refs-notexist \
+ refs/heads/dgit/unstable \
+ refs/remotes/dgit/dgit/unstable
+ (set -e; cd $tmp/git/$p.git
+ t-refs-same-more \
+ refs/dgit/sid \
+ `t-v-tag`
+ t-refs-notexist \
+ refs/dgit/unstable
+ )
+ git verify-tag `t-v-tag`
+}
+
+t-ref-dsc-dgit () {
+ perl -e '
+ use Dpkg::Control::Hash;
+ my $h = new Dpkg::Control::Hash allow_pgp=>1;
+ $h->parse(\*STDIN,"dsc");
+ my $ref = $h->{"Dgit"},"\n";
+ die unless $ref =~ m/^\w+\b/;
+ print $ref,"\n";
+ ' <$tmp/incoming/${p}_${v}.dsc >$tmp/t.ref1
+}
+
+t-apply-diff () {
+ local v1=$1
+ local v2=$2
+ (cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
+ | patch -p1 -u
+}