When receiving a push with dgit-repos-server, update the server's refs/heads/master...

diff --git a/debian/changelog b/debian/changelog
index b798cbd64be6852c86965833dd18f8ce9c914ec8..49b8777a7f1cb518cc0e7e7b31267f2b5efd279a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,10 @@ dgit (0.23~) unstable; urgency=low
   * Document in manpage under `dgit push' that it is best to build with
     dgit too.  Closes:#763333.
 
   * Document in manpage under `dgit push' that it is best to build with
     dgit too.  Closes:#763333.
 

+  * When receiving a push with dgit-repos-server, update the server's
+    refs/heads/master if we are pushing to what the distro regards as a
+    relevant branch, and the push would ff master.  Closes:#728209.
+

   * Fix inaccurate error message when archive's git hash is not an
     ancestor of git repo's git hash.
 
   * Fix inaccurate error message when archive's git hash is not an
     ancestor of git repo's git hash.
 

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index ae25aaa3bc1c7579fdc4ffcd302b4acf281ebda5..2d61db988be72b7ffcd61794ba50487342e9748c 100755 (executable)
--- 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
 # 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)
 #   --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
 #
 #
 # 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
 #
 # AUTH-SPEC is a :-separated list of
 #   KEYRING.GPG,AUTH-SPEC


@@ -181,6 +184,7 @@ our $dgitrepos;
 our $package;
 our $distro;
 our $suitesfile;
 our $package;
 our $distro;
 our $suitesfile;

+our $suitesformasterfile;

 our $policyhook;
 our $dgitlive;
 our $distrodir;
 our $policyhook;
 our $dgitlive;
 our $distrodir;


@@ -413,6 +417,7 @@ sub maybeinstallprospective () {
        chomp or die;
        printdebug " show-refs| $_\n";
        s/^\S*[1-9a-f]\S* (\S+)$/$1/ or die;
        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' :
        my $wh =
            m{^refs/tags/} ? 'tag' :
            m{^refs/dgit/} ? 'head' :


@@ -636,17 +641,27 @@ sub verifytag () {
     reject "key not found in keyrings";
 }
 
     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+$//;
     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;
     }
     die $! if SUITES->error;

+    return 0;
+}
+
+sub checksuite () {
+    printdebug "checksuite ($suitesfile)\n";
+    return if suite_is_in $suitesfile;

     reject "unknown suite";
 }
 
     reject "unknown suite";
 }
 


@@ -821,14 +836,26 @@ sub checks () {
 }
 
 sub onwardpush () {
 }
 
 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 $!";
     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 () {
 }
 
 sub finalisepush () {


@@ -899,11 +926,12 @@ our %indistrodir = (
     # keys are used for DGIT_DRS_XXX too
     'repos' => \$dgitrepos,
     'suites' => \$suitesfile,
     # keys are used for DGIT_DRS_XXX too
     'repos' => \$dgitrepos,
     'suites' => \$suitesfile,

+    'suites-master' => \$suitesformasterfile,

     'policy-hook' => \$policyhook,
     'dgit-live' => \$dgitlive,
     );
 
     '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
                    dgitlive keyrings dgitrepos distrodir);
 
 # workrepo and destrepo handled ad-hoc