Avoid use of "my $_", which is not portable

[dgit.git] / infra / dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index d990aeea5e3c2f2682ac48573701579f20168a20..50cba57082ddc385d22afd1f3fba23b8853eb27d 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -126,6 +126,8 @@ $SIG{__WARN__} = sub { die $_[0]; };
 #   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)
@@ -161,7 +163,8 @@ $SIG{__WARN__} = sub { die $_[0]; };
 # 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;
@@ -187,7 +190,7 @@ our $keyrings;
 our @lockfhs;
 
 our @deliberatelies;
-our %supersedes;
+our %previously;
 our $policy;
 our @policy_args;
 
@@ -319,7 +322,7 @@ 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('*'), sub {
        my ($objid,$objtype,$fullrefname,$reftail) = @_;
        print PREVIOUS "\n$objid $reftail .\n" or die $!;
     }, $real);
@@ -445,6 +448,8 @@ sub main__git_receive_pack () {
 our ($tagname, $tagval, $suite, $oldcommit, $commit);
 our ($version, %tagh);
 
+our ($tagexists_error);
+
 sub readupdates () {
     printdebug " updates ...\n";
     while (<STDIN>) {
@@ -456,7 +461,7 @@ sub readupdates () {
            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/}) {
@@ -511,9 +516,9 @@ sub parsetag () {
                    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 ($_)";
@@ -703,17 +708,17 @@ sub checktagnoreplay () {
     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++;
        }
@@ -721,11 +726,11 @@ sub checktagnoreplay () {
 
     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";
@@ -734,10 +739,10 @@ sub checktagnoreplay () {
                " 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;
        }
@@ -749,7 +754,7 @@ sub checktagnoreplay () {
            join("; ", @problems).
            "\n";
     }
-    printdebug "checktagnoreply - all ok\n"
+    printdebug "checktagnoreplay - all ok ($tagval)\n"
 }
 
 sub tagh1 ($) {
@@ -779,6 +784,14 @@ sub checks () {
                    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();