fixes for remote mode

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 08ecca6ffcf3175f856a3029020d09671cec735b..594281daa42a088ab162137abf5e68f0a6492d1f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -24,6 +24,7 @@ use Data::Dumper;
 use LWP::UserAgent;
 use Dpkg::Control::Hash;
 use File::Path;
+use File::Temp qw(tempdir);
 use File::Basename;
 use Dpkg::Version;
 use POSIX;
@@ -132,17 +133,17 @@ sub fetchspec () {
 # remote push initiator/responder protocol:
 #  < dgit-remote-push-ready [optional extra info ignored by old initiators]
 #
-#  > file begin parsed-changelog
+#  > file parsed-changelog
 #  [indicates that output of dpkg-parsechangelog follows]
 #  > data-block NBYTES
 #  > [NBYTES bytes of data (no newline)]
 #  [maybe some more blocks]
 #  > data-end
 #
-#  > file begin dsc
+#  > file dsc
 #  [etc]
 #
-#  > file begin changes
+#  > file changes
 #  [etc]
 #
 #  > param head HEAD
@@ -176,7 +177,13 @@ sub protocol_expect (&$) {
     local $_;
     $_ = <$fh>;
     defined && chomp or badproto $fh, "eof";
-    return if &$match;
+    if (wantarray) {
+       my @r = &$match;
+       return @r if @r;
+    } else {
+       my $r = &$match;
+       return $r if $r;
+    }
     badproto $fh, "\`$_'";
 }
 
@@ -208,8 +215,11 @@ sub protocol_receive_file ($$) {
     my ($fh, $ourfn) = @_;
     open PF, ">", $ourfn or die "$ourfn: $!";
     for (;;) {
-       protocol_expect { m/^data-block (.*})$|data-end$/ } \*STDIN;
-       length $1 or last;
+       my ($y,$l) = protocol_expect {
+           m/^data-block (.*})$|data-end$/;
+           length $1 ? (1,$1) : (0);
+       } \*STDIN;
+       last unless $y;
        my $d = protocol_read_bytes \*STDIN, $1;
        print PF $d or die $!;
     }
@@ -228,7 +238,7 @@ sub responder_send_command ($) {
 sub responder_send_file ($$) {
     my ($keyword, $ourfn) = @_;
     return unless $we_are_responder;
-    responder_send_command "file-begin $keyword";
+    responder_send_command "file $keyword";
     protocol_send_file \*STDOUT, $ourfn;
 }
 
@@ -289,13 +299,13 @@ sub shellquote {
            push @out, $_;
        }
     }
-    return join '', @out;
+    return join ' ', @out;
 }
 
 sub printcmd {
     my $fh = shift @_;
     my $intro = shift @_;
-    print $fh $intro or die $!;
+    print $fh $intro," " or die $!;
     print $fh shellquote @_ or die $!;
     print $fh "\n" or die $!;
 }
@@ -371,6 +381,7 @@ main usages:
   dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
   dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
   dgit [dgit-opts] push [dgit-opts] [suite]
+  dgit [dgit-opts] rpush build-host:build-dir ...
 important dgit options:
   -k<keyid>           sign tag and package with <keyid> instead of default
   --dry-run -n        do not change anything, but go through the motions
@@ -1088,7 +1099,7 @@ sub push_parse_changelog ($) {
     return ($clogp, $cversion, $tag, $dscfn);
 }
 
-sub push_parse_dsc ($$) {
+sub push_parse_dsc ($$$) {
     my ($dscfn,$dscfnwhat, $cversion) = @_;
     $dsc = parsecontrol($dscfn,$dscfnwhat);
     my $dversion = getfield $dsc, 'Version';
@@ -1114,6 +1125,8 @@ sub push_mktag ($$$$$$$$) {
                " does not match changelog \`$clogp->{$field}'";
     }
 
+    my $cversion = getfield $clogp, 'Version';
+
     # We make the git tag by hand because (a) that makes it easier
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
@@ -1153,7 +1166,7 @@ sub sign_changes ($) {
     if ($sign) {
        my @debsign_cmd = @debsign;
        push @debsign_cmd, "-k$keyid" if defined $keyid;
-       push @debsign_cmd, "-p$pgp[0]" if $pgp[0] ne 'gpg';
+       push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
        push @debsign_cmd, $changesfile;
        runcmd_ordryrun @debsign_cmd;
     }
@@ -1224,7 +1237,7 @@ sub dopush () {
        }
     }
 
-    responder_send_file('changes',$changesfn);
+    responder_send_file('changes',$changesfile);
 
     my $tfn = sub { ".git/dgit/tag$_[0]"; };
     my ($tagobjfn) =
@@ -1258,7 +1271,7 @@ sub dopush () {
        my $dryrunsuffix = $dryrun ? ".tmp" : "";
        responder_receive_files('signed-dsc-changes',
                                "../$dscfn$dryrunsuffix",
-                               "$changesfile$dryrupnsuffix");
+                               "$changesfile$dryrunsuffix");
     } else {
        sign_changes $changesfile;
     }
@@ -1383,7 +1396,7 @@ sub cmd_remote_push_responder {
     die unless @rargs;
     my ($dir) = @rargs;
     chdir $dir or die "$dir: $!";
-    $we_are_remote = 1;
+    $we_are_responder = 1;
     $|=1;
     responder_send_command("dgit-remote-push-ready");
     &cmd_push;
@@ -1416,20 +1429,23 @@ sub cmd_rpush {
     $dir =~ s{^-}{./-};
     my @rargs = ($dir);
     my @rdgit;
-    push @rdgit, @dgit
+    push @rdgit, @dgit;
     push @rdgit, @ropts;
-    push @rdgit, (scalar @rargs), @rargs;
+    push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs;
     push @rdgit, @ARGV;
     my @cmd = (@ssh, $host, shellquote @rdgit);
-    my $pid = open2(\*RO, \*RI, @cmd);
+    printcmd \*DEBUG,"+",@cmd;
     eval {
        $i_tmp = tempdir();
+       my $pid = open2(\*RO, \*RI, @cmd);
        chdir $i_tmp or die "$i_tmp $!";
        initiator_expect { m/^dgit-remote-push-ready/ };
        for (;;) {
-           initiator_expect { m/^(\S+)(?: (.*))?$/ };
-           my ($icmd,$iargs) = ($1, $2);
-           i_method "i_resp_", $icmd, $iargs;
+           my ($icmd,$iargs) = initiator_expect {
+               m/^(\S+)(?: (.*))?$/;
+               ($1,$2);
+           };
+           i_method "i_resp", $icmd, $iargs;
        }
     };
     i_cleanup();
@@ -1449,7 +1465,7 @@ sub i_resp_complete {
 
 sub i_resp_file ($) {
     my ($keyword) = @_;
-    my $localname = i_method "i_localname_", $keyword;
+    my $localname = i_method "i_localname", $keyword;
     my $localpath = "$i_tmp/$localname";
     stat $localpath and badproto \*RO, "file $keyword ($localpath) twice";
     protocol_receive_file \*RO, $localpath;
@@ -1467,7 +1483,7 @@ our %i_wanted;
 sub i_resp_want ($) {
     my ($keyword) = @_;
     die "$keyword ?" if $i_wanted{$keyword}++;
-    my @localpaths = i_method "i_want_", $keyword;
+    my @localpaths = i_method "i_want", $keyword;
     foreach my $localpath (@localpaths) {
        protocol_send_file \*RI, $localpath;
     }
@@ -1482,11 +1498,11 @@ sub i_localname_dsc {
     ($i_clogp, $i_version, $i_tag, $i_dscfn) =
        push_parse_changelog 'remote-changelog.822';
     die if $i_dscfn =~ m#/|^\W#;
-    return $dscfn;
+    return $i_dscfn;
 }
 
 sub i_want_signed_tag {
-    defined $i_param{'head'} && defined $dscfn
+    defined $i_param{'head'} && defined $i_dscfn
        or badproto \*RO, "sequencing error";
     my $head = $i_param{'head'};
     die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
@@ -1749,35 +1765,35 @@ sub parseopts () {
                } elsif (s/^-h/-/) {
                    cmd_help();
                } elsif (s/^-D/-/) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    open DEBUG, ">&STDERR" or die $!;
                    $debug++;
                } elsif (s/^-N/-/) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    $new_package=1;
                } elsif (m/^-[vm]/) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    push @changesopts, $_;
                    $_ = '';
                } elsif (s/^-c(.*=.*)//s) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    push @git, '-c', $1;
                } elsif (s/^-d(.*)//s) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    $idistro = $1;
                } elsif (s/^-C(.*)//s) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    $changesfile = $1;
                } elsif (s/^-k(.*)//s) {
                    $keyid=$1;
                } elsif (s/^-wn//s) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    $cleanmode = 'none';
                } elsif (s/^-wg//s) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    $cleanmode = 'git';
                } elsif (s/^-wd//s) {
-                   push @ropts, $_;
+                   push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                } else {
                    badusage "unknown short option \`$_'";