X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=1be6e78d26613f27ce3a172cd2bbb0962d5780da;hp=50cba57082ddc385d22afd1f3fba23b8853eb27d;hb=ce56d58f8ba00e77d5ebb5bba91bd187334b427e;hpb=68ace2786dc26749014ea70a6ebb2b896b1f25d1

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 50cba570..1be6e78d 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -7,6 +7,7 @@
 # settings
 #   --repos=GIT-REPOS-DIR      default DISTRO-DIR/repos/
 #   --suites=SUITES-FILE       default DISTRO-DIR/suites
+#   --suites-master=SUITES-FILE default DISTRO-DIR/suites-master
 #   --policy-hook=POLICY-HOOK  default DISTRO-DIR/policy-hook
 #   --dgit-live=DGIT-LIVE-DIR  default DISTRO-DIR/dgit-live
 # (DISTRO-DIR is not used other than as default and to pass to policy hook)
@@ -17,8 +18,10 @@
 #
 # Works like git-receive-pack
 #
-# SUITES is the name of a file which lists the permissible suites
-# one per line (#-comments and blank lines ignored)
+# SUITES-FILE is the name of a file which lists the permissible suites
+# one per line (#-comments and blank lines ignored).  For --suites-master
+# it is a list of the suite(s) which should, when pushed to, update
+# `master' on the server (if fast forward).
 #
 # AUTH-SPEC is a :-separated list of
 #   KEYRING.GPG,AUTH-SPEC
@@ -62,7 +65,7 @@ $SIG{__WARN__} = sub { die $_[0]; };
 #   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
@@ -181,6 +184,7 @@ our $dgitrepos;
 our $package;
 our $distro;
 our $suitesfile;
+our $suitesformasterfile;
 our $policyhook;
 our $dgitlive;
 our $distrodir;
@@ -259,7 +263,7 @@ sub recorderror ($) {
 sub reject ($) {
     my ($why) = @_;
     recorderror "reject: $why";
-    die "dgit-repos-server: reject: $why\n";
+    die "\ndgit-repos-server: reject: $why\n\n";
 }
 
 sub runcmd {
@@ -291,10 +295,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 () {
@@ -322,7 +327,7 @@ sub movetogarbage () {
 
     ensuredir "$dgitrepos/_removed-tags";
     open PREVIOUS, ">>", removedtagsfile or die removedtagsfile." $!";
-    git_for_each_ref('refs/tags/'.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);
@@ -412,6 +417,7 @@ sub maybeinstallprospective () {
 	chomp or die;
 	printdebug " show-refs| $_\n";
 	s/^\S*[1-9a-f]\S* (\S+)$/$1/ or die;
+	next if m{^refs/heads/master$};
 	my $wh =
 	    m{^refs/tags/} ? 'tag' :
 	    m{^refs/dgit/} ? 'head' :
@@ -457,7 +463,7 @@ sub readupdates () {
 	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;
@@ -635,17 +641,27 @@ sub verifytag () {
     reject "key not found in keyrings";
 }
 
-sub checksuite () {
-    printdebug "checksuite ($suitesfile)\n";
-    open SUITES, "<", $suitesfile or die $!;
+sub suite_is_in ($) {
+    my ($sf) = @_;
+    printdebug "suite_is_in ($sf)\n";
+    if (!open SUITES, "<", $sf) {
+	$!==ENOENT or die $!;
+	return 0;
+    }
     while (<SUITES>) {
 	chomp;
 	next unless m/\S/;
 	next if m/^\#/;
 	s/\s+$//;
-	return if $_ eq $suite;
+	return 1 if $_ eq $suite;
     }
     die $! if SUITES->error;
+    return 0;
+}
+
+sub checksuite () {
+    printdebug "checksuite ($suitesfile)\n";
+    return if suite_is_in $suitesfile;
     reject "unknown suite";
 }
 
@@ -772,11 +788,9 @@ sub checks () {
     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();
 
@@ -822,14 +836,26 @@ sub checks () {
 }
 
 sub onwardpush () {
-    my @cmd = (qw(git send-pack), $destrepo);
-    push @cmd, qw(--force) if $policy & NOFFCHECK;
+    my @cmdbase = (qw(git send-pack), $destrepo);
+    push @cmdbase, qw(--force) if $policy & NOFFCHECK;
+
+    my @cmd = @cmdbase;
     push @cmd, "$commit:refs/dgit/$suite",
 	       "$tagval:refs/tags/$tagname";
     debugcmd '+',@cmd;
     $!=0;
     my $r = system @cmd;
     !$r or die "onward push to $destrepo failed: $r $!";
+
+    if (suite_is_in $suitesformasterfile) {
+	@cmd = @cmdbase;
+	push @cmd, "$commit:refs/heads/master";
+	debugcmd '+', @cmd;
+	$!=0; my $r = system @cmd;
+	# tolerate errors (might be not ff)
+	!($r & ~0xff00) or die
+	    "onward push to $destrepo#master failed: $r $!";
+    }
 }
 
 sub finalisepush () {
@@ -900,11 +926,12 @@ our %indistrodir = (
     # keys are used for DGIT_DRS_XXX too
     'repos' => \$dgitrepos,
     'suites' => \$suitesfile,
+    'suites-master' => \$suitesformasterfile,
     'policy-hook' => \$policyhook,
     'dgit-live' => \$dgitlive,
     );
 
-our @hookenvs = qw(distro suitesfile policyhook
+our @hookenvs = qw(distro suitesfile suitesformasterfile policyhook
                    dgitlive keyrings dgitrepos distrodir);
 
 # workrepo and destrepo handled ad-hoc