#
# git protocol proxy to check dgit pushes etc.
#
-# Copyright (C) 2014-2016 Ian Jackson
+# Copyright (C) 2014-2017,2019 Ian Jackson
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
if ($dgititemfn->()) {
} elsif (s/^distro\=(\S+) //) {
$distrofn->($1);
- } elsif (s/^[-+.=0-9a-z]\S* //) {
+ } elsif (s/^([-+.=0-9a-z]\S*) //) {
+ printdebug " parsetag ignoring unrecognised \`$1'\n";
} else {
die "unknown dgit info in tag ($_)";
}
# current head for the suite (there must be at least one).
#
# This prevents any tag implying a NOFFCHECK push being
- # replayed to rewind from a different head.
+ # replayed to overwrite a different head.
#
# The possibility of an earlier ff-only push being replayed is
# eliminated as follows: the tag from such a push would still
# workrepo and destrepo handled ad-hoc
sub mode_tag2upload () {
- # PROTOTYPE
# CALLER MUST PREVENT MULTIPLE CONCURRENT RUNS IN SAME CWD
# If we fail (exit nonzero), caller should capture our stderr,
# and retry some bounded number of times in some appropriate way
+ # Uses whatever ambient gpg key is available
@ARGV==2 or die;
my $url;
my $tagref = "refs/tags/$tagval";
rmtree $work;
+ rmtree 'bpd';
mkdir $work or die $!;
+ mkdir 'bpd' or die $!;
+ unlink <*.orig*>;
+ dif $! if <*.orig*>;
changedir $work;
runcmd qw(git init -q);
runcmd qw(git remote add origin), $url;
# quick and dirty check, will check properly later
m/^\[dgit[^"]* please-upload(?:\]| )/m or
- $quit->("tag missing please-upload request $_");
+ $quit->("tag missing please-upload request");
m/^tagger (.*) \d+ [-+]\d+$/m or
$quit->("failed to fish tagger out of tag");
# This is for us. From now on, we will capture errors to
# be emailed to the tagger.
- # TODO: failures to git fetch from salsa will burn a version
open H, ">>dgit-tmp/tagupl.email" or die $!;
print H <<END or die $!;
-f$ENV{DGIT_DRS_EMAIL_NOREPLY} \\
<tagupl.email
END
- exit 0;
+ $quit->("failed, emailed");
}
open STDERR, ">&L" or die $!;
open STDOUT, ">&STDERR" or die $!;
open DEBUG, ">&STDERR" if $debuglevel;
- die "$tagmversion != $version " unless $tagmversion eq $version;
+ reject "version mismatch $tagmversion != $version "
+ unless $tagmversion eq $version;
my %need = map { $_ => 1 } qw(please-upload split);
my ($upstreamc, $upstreamt);
my $quilt;
my $distro_ok;
+ confess if defined $upstreamt;
+
parsetag_general sub {
if (m/^(\S+) / && exists $need{$1}) {
$_ = $';
$upstreamc = $1;
} elsif (s/^upstream-tag=(\S+) //) {
$upstreamt = $1;
- } elsif (s/^quilt=([-+0-9a-z]+) //) {
+ } elsif (s/^--quilt=([-+0-9a-z]+) //) {
$quilt = $1;
} else {
return 0;
$distro_ok ||= $gotdistro eq $distro;
};
- $quit->("other distro") unless $distro_ok;
+ $quit->("not for this distro") unless $distro_ok;
reject "missing \"$_\"" foreach keys %need;
+ verifytag();
+
reject "upstream tag and not commitish, or v-v"
unless defined $upstreamt == defined $upstreamc;
- verifytag();
-
my @dgit;
push @dgit, $ENV{DGIT_DRS_DGIT} // 'dgit';
push @dgit, '-wn';
push @dgit, "-p$package";
+ push @dgit, '--build-products-dir=../bpd';
changedir "..";
runcmd (@dgit, qw(setup-gitattributes));
my @fetch = qw(git fetch origin --unshallow);
if (defined $upstreamt) {
- runcmd qw(git check-ref-format), "refs/tags/$upstreamt";
runcmd qw(git check-ref-format), "refs/tags/$upstreamt";
my $utagref = "refs/tags/$upstreamt";
push @fetch, "$utagref:$utagref";
}
runcmd @fetch;
- $upstreamc eq git_rev_parse "refs/tags/$upstreamt" or die;
-
runcmd qw(git checkout -q), "refs/tags/$tagval";
- @fetch = (@dgit, qw(fetch), $suite);
+ my $clogp = parsechangelog();
+ my $clogf = sub {
+ my ($f, $exp) = @_;
+ my $got = getfield $clogp, $f;
+ return if $got eq $exp;
+ reject "mismatch: changelog $f $got != $exp";
+ };
+ $clogf->('Version', $version);
+ $clogf->('Source', $package);
+
+ @fetch = (@dgit, qw(--for-push fetch), $suite);
debugcmd "+",@_;
$!=0; $?=-1;
if (system @fetch) {
failedcmd @fetch unless $? == 4*256;
}
# this is just to get the orig, so we don't really care about the ref
- runcmd qw(git deborig), "$upstreamc";
+ if (defined $upstreamc) {
+ my $need_upstreamc = git_rev_parse "refs/tags/$upstreamt";
+ $upstreamc eq $need_upstreamc or reject
+ "upstream-commitish=$upstreamc but tag refers to $need_upstreamc";
+ runcmd qw(git deborig), "$upstreamc";
+ }
my @dgitcmd;
push @dgitcmd, @dgit;
if (defined $quilt) {
push @dgitcmd, "--quilt=$quilt";
if ($quilt =~ m/baredebian/) {
- die "needed upstream commmitish with --quilt=baredebian";
- push @dgitcmd, "--upstream-commitish=$upstreamc";
+ die "needed upstream commmitish with --quilt=baredebian"
+ unless defined $upstreamc;
+ push @dgitcmd, "--upstream-commitish=refs/tags/$upstreamt";
}
}
push @dgitcmd, qw(push-source --new --overwrite), $suite;
- # xxx what about the key to use?
runcmd @dgitcmd;
~ianmdlvl / dgit.git / blobdiff