X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=a6f57be64311ba3fea2d84462404b4fd2c16e29b;hp=7ab29e278f0058a3b56dca65c3567e4fe592b5ca;hb=76cbbc78a07e44b4c917bbaa93bf7cd602387082;hpb=673989e62a91bf9fbd637f766af022b6da77f830

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 7ab29e27..a6f57be6 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -163,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;
@@ -189,7 +190,7 @@ our $keyrings;
 our @lockfhs;
 
 our @deliberatelies;
-our %supersedes;
+our %previously;
 our $policy;
 our @policy_args;
 
@@ -290,10 +291,11 @@ sub mkemptyrepo ($$) {
 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 () {
@@ -447,6 +449,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>) {
@@ -458,7 +462,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/}) {
@@ -513,9 +517,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 ($_)";
@@ -705,17 +709,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++;
 	}
@@ -723,11 +727,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";
@@ -736,10 +740,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;
 	}
@@ -751,7 +755,7 @@ sub checktagnoreplay () {
 	    join("; ", @problems).
 	    "\n";
     }
-    printdebug "checktagnoreply - all ok\n"
+    printdebug "checktagnoreplay - all ok ($tagval)\n"
 }
 
 sub tagh1 ($) {
@@ -781,6 +785,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();