# as a result of this the stunt pre-receive hook runs; it does this:
# + understand what refs we are allegedly updating and
# check some correspondences:
-# * we are updating only refs/tags/debian/* and refs/dgit/*
+# * we are updating only refs/tags/DISTRO/* and refs/dgit/*
# * and only one of each
# * and the tag does not already exist
# and
# POLICY-HOOK-SCRIPT ... push-confirm PACKAGE \
# VERSION SUITE TAGNAME DELIBERATELIES FRESH-REPO|'' [...]
#
+# DELIBERATELIES is like this: --deliberately-foo,--deliberately-bar,...
+#
# Exit status is a bitmask. Bit weight constants are defined in Dgit.pm.
# NOFFCHECK (2)
# suppress dgit-repos-server's fast-forward check ("push" only)
# appropriate lock.
#
# If policy hook wants to run dgit (or something else in the dgit
-# package), it should use DGIT-LIVE-DIR/dgit (etc.)
+# package), it should use DGIT-LIVE-DIR/dgit (etc.), or if that is
+# ENOENT, use the installed version.
use POSIX;
our @lockfhs;
our @deliberatelies;
-our %supersedes;
+our %previously;
our $policy;
our @policy_args;
sub mkrepo_fromtemplate ($) {
my ($dir) = @_;
my $template = "$dgitrepos/_template";
- locksometree($template);
+ my $templatelock = locksometree($template);
printdebug "copy template $template -> $dir\n";
my $r = system qw(cp -a --), $template, $dir;
!$r or die "create new repo $dir failed: $r $!";
+ close $templatelock;
}
sub movetogarbage () {
ensuredir "$dgitrepos/_removed-tags";
open PREVIOUS, ">>", removedtagsfile or die removedtagsfile." $!";
- git_for_each_ref(debiantag('*'), sub {
+ git_for_each_ref('refs/tags/'.debiantag('*',$distro), sub {
my ($objid,$objtype,$fullrefname,$reftail) = @_;
print PREVIOUS "\n$objid $reftail .\n" or die $!;
}, $real);
our ($tagname, $tagval, $suite, $oldcommit, $commit);
our ($version, %tagh);
+our ($tagexists_error);
+
sub readupdates () {
printdebug " updates ...\n";
while (<STDIN>) {
printdebug " upd.| $_\n";
m/^(\S+) (\S+) (\S+)$/ or die "$_ ?";
my ($old, $sha1, $refname) = ($1, $2, $3);
- if ($refname =~ m{^refs/tags/(?=debian/)}) {
+ if ($refname =~ m{^refs/tags/(?=$distro/)}) {
reject "pushing multiple tags!" if defined $tagname;
$tagname = $'; #';
$tagval = $sha1;
- reject "tag $tagname already exists -".
+ $tagexists_error= "tag $tagname already exists -".
" not replacing previously-pushed version"
if $old =~ m/[^0]/;
} elsif ($refname =~ m{^refs/dgit/}) {
die "$1 != $distro" unless $1 eq $distro;
} elsif (s/^(--deliberately-$deliberately_re) //) {
push @deliberatelies, $1;
- } elsif (s/^supersede:(\S+)=(\w+) //) {
- die "supersede $1 twice" if defined $supersedes{$1};
- $supersedes{$1} = $2;
+ } elsif (s/^previously:(\S+)=(\w+) //) {
+ die "previously $1 twice" if defined $previously{$1};
+ $previously{$1} = $2;
} elsif (s/^[-+.=0-9a-z]\S* //) {
} else {
die "unknown dgit info in tag ($_)";
my $nchecked = 0;
my @problems;
- my $check_ref_superseded= sub {
+ my $check_ref_previously= sub {
my ($objid,$objtype,$fullrefname,$reftail) = @_;
my $supkey = $fullrefname;
$supkey =~ s{^refs/}{} or die "$supkey $objid ?";
- my $supobjid = $supersedes{$supkey};
+ my $supobjid = $previously{$supkey};
if (!defined $supobjid) {
printdebug "checktagnoreply - missing\n";
- push @problems, "does not supersede $supkey";
+ push @problems, "does not declare previously $supkey";
} elsif ($supobjid ne $objid) {
- push @problems, "supersedes $supkey=$supobjid".
- " but previously $supkey=$objid";
+ push @problems, "declared previously $supkey=$supobjid".
+ " but actually previously $supkey=$objid";
} else {
$nchecked++;
}
if ($policy & FRESHREPO) {
foreach my $kind (qw(tags heads)) {
- git_for_each_ref("refs/$kind", $check_ref_superseded);
+ git_for_each_ref("refs/$kind", $check_ref_previously);
}
} else {
my $branch= server_branch($suite);
- my $branchhead= git_get_ref($branch);
+ my $branchhead= git_get_ref(server_ref($suite));
if (!length $branchhead) {
# No such branch - NOFFCHECK was unnecessary. Oh well.
printdebug "checktagnoreplay - not FRESHREPO, new branch, ok\n";
" checking for overwriting refs/$branch=$branchhead\n";
git_for_each_tag_referring($branchhead, sub {
my ($tagobjid,$refobjid,$fullrefname,$tagname) = @_;
- $check_ref_superseded->($tagobjid,undef,$fullrefname,undef);
+ $check_ref_previously->($tagobjid,undef,$fullrefname,undef);
});
- printdebug "checktagnoreply - not FRESHREPO, nchecked=$nchecked";
- push @problems, "does not supersede any tag".
+ printdebug "checktagnoreplay - not FRESHREPO, nchecked=$nchecked";
+ push @problems, "does not declare previously any tag".
" referring to branch head $branch=$branchhead"
unless $nchecked;
}
join("; ", @problems).
"\n";
}
- printdebug "checktagnoreply - all ok\n"
+ printdebug "checktagnoreplay - all ok ($tagval)\n"
}
sub tagh1 ($) {
tagh1('object') eq $commit or reject "tag refers to wrong commit";
tagh1('tag') eq $tagname or reject "tag name in tag is wrong";
- my $v = $version;
- $v =~ y/~:/_%/;
-
- printdebug "translated version $v\n";
- $tagname eq "debian/$v" or die;
+ my $expecttagname = debiantag $version, $distro;
+ printdebug "expected tag $expecttagname\n";
+ $tagname eq $expecttagname or die;
lockrealtree();
join(",",@deliberatelies));
$policy = policyhook(NOFFCHECK|FRESHREPO, 'push', @policy_args);
+ if (defined $tagexists_error) {
+ if ($policy & FRESHREPO) {
+ printdebug "ignoring tagexists_error: $tagexists_error\n";
+ } else {
+ reject $tagexists_error;
+ }
+ }
+
checktagnoreplay();
checksuite();