dgit: $isuite fixes: defer pushing and rpush_handle_protovsn_bothends in rpush

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 8c9765e38c39658e3bb776f4a365080f800bd1e8..11f473ca8bf7c56096316094382db3f45f150a6e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -48,7 +48,7 @@ our $absurdity = undef; ###substituted###
 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
 our $protovsn;
 
 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
 our $protovsn;
 

-our $isuite = 'unstable';
+our $isuite;

 our $idistro;
 our $package;
 our @ropts;
 our $idistro;
 our $package;
 our @ropts;


@@ -73,6 +73,7 @@ our $dodep14tag;
 our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;
 our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;

+our $we_are_initiator;

 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
 our $tagformat_want;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
 our $tagformat_want;


@@ -565,6 +566,7 @@ sub cmd_help () {
 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
 
 our %defcfg = ('dgit.default.distro' => 'debian',
 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
 
 our %defcfg = ('dgit.default.distro' => 'debian',

+              'dgit.default.default-suite' => 'unstable',

               'dgit.default.old-dsc-distro' => 'debian',
               'dgit-suite.*-security.distro' => 'debian-security',
               'dgit.default.username' => '',
               'dgit.default.old-dsc-distro' => 'debian',
               'dgit-suite.*-security.distro' => 'debian-security',
               'dgit.default.username' => '',


@@ -3815,8 +3817,12 @@ sub push_parse_changelog ($) {
     fail "-p specified $package but changelog specified $clogpackage"
        unless $package eq $clogpackage;
     my $cversion = getfield $clogp, 'Version';
     fail "-p specified $package but changelog specified $clogpackage"
        unless $package eq $clogpackage;
     my $cversion = getfield $clogp, 'Version';

-    my $tag = debiantag($cversion, access_nomdistro);
-    runcmd @git, qw(check-ref-format), $tag;
+
+    if (!$we_are_initiator) {
+       # rpush initiator can't do this because it doesn't have $isuite yet
+       my $tag = debiantag($cversion, access_nomdistro);
+       runcmd @git, qw(check-ref-format), $tag;
+    }

 
     my $dscfn = dscfn($cversion);
 
 
     my $dscfn = dscfn($cversion);
 


@@ -4001,6 +4007,7 @@ END
     prep_ud();
 
     access_giturl(); # check that success is vaguely likely
     prep_ud();
 
     access_giturl(); # check that success is vaguely likely

+    rpush_handle_protovsn_bothends() if $we_are_initiator;

     select_tagformat();
 
     my $clogpfn = ".git/dgit/changelog.822.tmp";
     select_tagformat();
 
     my $clogpfn = ".git/dgit/changelog.822.tmp";


@@ -4298,7 +4305,8 @@ sub fetchpullargs () {
        $isuite = branchsuite();
        if (!$isuite) {
            my $clogp = parsechangelog();
        $isuite = branchsuite();
        if (!$isuite) {
            my $clogp = parsechangelog();

-           $isuite = getfield $clogp, 'Distribution';
+           my $clogsuite = getfield $clogp, 'Distribution';
+           $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';

        }
     } elsif (@ARGV==1) {
        ($isuite) = @ARGV;
        }
     } elsif (@ARGV==1) {
        ($isuite) = @ARGV;


@@ -4330,7 +4338,6 @@ END
 
 sub cmd_push {
     parseopts();
 
 sub cmd_push {
     parseopts();

-    pushing();

     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();
     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();


@@ -4343,6 +4350,7 @@ sub cmd_push {
        badusage "incorrect arguments to dgit push";
     }
     $isuite = getfield $clogp, 'Distribution';
        badusage "incorrect arguments to dgit push";
     }
     $isuite = getfield $clogp, 'Distribution';

+    pushing();

     if ($new_package) {
        local ($package) = $existing_package; # this is a hack
        canonicalise_suite();
     if ($new_package) {
        local ($package) = $existing_package; # this is a hack
        canonicalise_suite();


@@ -4373,8 +4381,6 @@ sub cmd_remote_push_build_host {
     $we_are_responder = 1;
     $us .= " (build host)";
 
     $we_are_responder = 1;
     $us .= " (build host)";
 

-    pushing();
-

     open PI, "<&STDIN" or die $!;
     open STDIN, "/dev/null" or die $!;
     open PO, ">&STDOUT" or die $!;
     open PI, "<&STDIN" or die $!;
     open STDIN, "/dev/null" or die $!;
     open PO, ">&STDOUT" or die $!;


@@ -4393,7 +4399,6 @@ sub cmd_remote_push_build_host {
        unless defined $protovsn;
 
     responder_send_command("dgit-remote-push-ready $protovsn");
        unless defined $protovsn;
 
     responder_send_command("dgit-remote-push-ready $protovsn");

-    rpush_handle_protovsn_bothends();

     changedir $dir;
     &cmd_push;
 }
     changedir $dir;
     &cmd_push;
 }


@@ -4455,6 +4460,8 @@ sub cmd_rpush {
     my @cmd = (@ssh, $host, shellquote @rdgit);
     debugcmd "+",@cmd;
 
     my @cmd = (@ssh, $host, shellquote @rdgit);
     debugcmd "+",@cmd;
 

+    $we_are_initiator=1;
+

     if (defined $initiator_tempdir) {
        rmtree $initiator_tempdir;
        mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
     if (defined $initiator_tempdir) {
        rmtree $initiator_tempdir;
        mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";


@@ -5414,6 +5421,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
 
     rmtree '.pc';
 

+    runcmd @git, qw(checkout -f), $headref, qw(-- debian);

     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";
 
     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";
 


@@ -6156,18 +6164,28 @@ sub cmd_clone_dgit_repos_server {
     badusage "need destination argument" unless @ARGV==1;
     my ($destdir) = @ARGV;
     $package = '_dgit-repos-server';
     badusage "need destination argument" unless @ARGV==1;
     my ($destdir) = @ARGV;
     $package = '_dgit-repos-server';

+    local $access_forpush = 0;

     my @cmd = (@git, qw(clone), access_giturl(), $destdir);
     debugcmd ">",@cmd;
     exec @cmd or fail "exec git clone: $!\n";
 }
 
     my @cmd = (@git, qw(clone), access_giturl(), $destdir);
     debugcmd ">",@cmd;
     exec @cmd or fail "exec git clone: $!\n";
 }
 

+sub cmd_print_dgit_repos_server_source_url {
+    badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
+       if @ARGV;
+    $package = '_dgit-repos-server';
+    local $access_forpush = 0;
+    my $url = access_giturl();
+    print $url, "\n" or die $!;
+}
+

 sub cmd_setup_mergechangelogs {
     badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
     setup_mergechangelogs(1);
 }
 
 sub cmd_setup_useremail {
 sub cmd_setup_mergechangelogs {
     badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
     setup_mergechangelogs(1);
 }
 
 sub cmd_setup_useremail {

-    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    badusage "no arguments allowed to dgit setup-useremail" if @ARGV;

     setup_useremail(1);
 }
 
     setup_useremail(1);
 }
 


@@ -6435,6 +6453,10 @@ END
 
 
 sub parseopts_late_defaults () {
 
 
 sub parseopts_late_defaults () {

+    $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
+       if defined $idistro;
+    $isuite //= cfg('dgit.default.default-suite');
+

     foreach my $k (keys %opts_opt_map) {
        my $om = $opts_opt_map{$k};
 
     foreach my $k (keys %opts_opt_map) {
        my $om = $opts_opt_map{$k};