fixes for remote mode

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 448412e242f218c12a3c32f0ce5efb724d86d7c1..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 LWP::UserAgent;
 use Dpkg::Control::Hash;
 use File::Path;

+use File::Temp qw(tempdir);

 use File::Basename;
 use Dpkg::Version;
 use POSIX;
 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]
 #
 # 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
 #
 #  [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]
 #
 #  [etc]
 #

-#  > file begin changes
+#  > file changes

 #  [etc]
 #
 #  > param head HEAD
 #  [etc]
 #
 #  > param head HEAD


@@ -176,7 +177,13 @@ sub protocol_expect (&$) {
     local $_;
     $_ = <$fh>;
     defined && chomp or badproto $fh, "eof";
     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, "\`$_'";
 }
 
     badproto $fh, "\`$_'";
 }
 


@@ -208,8 +215,11 @@ sub protocol_receive_file ($$) {
     my ($fh, $ourfn) = @_;
     open PF, ">", $ourfn or die "$ourfn: $!";
     for (;;) {
     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 $!;
     }
        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;
 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;
 }
 
     protocol_send_file \*STDOUT, $ourfn;
 }
 


@@ -1421,18 +1431,21 @@ sub cmd_rpush {
     my @rdgit;
     push @rdgit, @dgit;
     push @rdgit, @ropts;
     my @rdgit;
     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);
     push @rdgit, @ARGV;
     my @cmd = (@ssh, $host, shellquote @rdgit);

-    my $pid = open2(\*RO, \*RI, @cmd);
+    printcmd \*DEBUG,"+",@cmd;

     eval {
        $i_tmp = tempdir();
     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 (;;) {
        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();
        }
     };
     i_cleanup();


@@ -1452,7 +1465,7 @@ sub i_resp_complete {
 
 sub i_resp_file ($) {
     my ($keyword) = @_;
 
 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;
     my $localpath = "$i_tmp/$localname";
     stat $localpath and badproto \*RO, "file $keyword ($localpath) twice";
     protocol_receive_file \*RO, $localpath;


@@ -1470,7 +1483,7 @@ our %i_wanted;
 sub i_resp_want ($) {
     my ($keyword) = @_;
     die "$keyword ?" if $i_wanted{$keyword}++;
 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;
     }
     foreach my $localpath (@localpaths) {
        protocol_send_file \*RI, $localpath;
     }


@@ -1752,35 +1765,35 @@ sub parseopts () {
                } elsif (s/^-h/-/) {
                    cmd_help();
                } elsif (s/^-D/-/) {
                } elsif (s/^-h/-/) {
                    cmd_help();
                } elsif (s/^-D/-/) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    open DEBUG, ">&STDERR" or die $!;
                    $debug++;
                } elsif (s/^-N/-/) {
                    open DEBUG, ">&STDERR" or die $!;
                    $debug++;
                } elsif (s/^-N/-/) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    $new_package=1;
                } elsif (m/^-[vm]/) {
                    $new_package=1;
                } elsif (m/^-[vm]/) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    push @changesopts, $_;
                    $_ = '';
                } elsif (s/^-c(.*=.*)//s) {
                    push @changesopts, $_;
                    $_ = '';
                } elsif (s/^-c(.*=.*)//s) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    push @git, '-c', $1;
                } elsif (s/^-d(.*)//s) {
                    push @git, '-c', $1;
                } elsif (s/^-d(.*)//s) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    $idistro = $1;
                } elsif (s/^-C(.*)//s) {
                    $idistro = $1;
                } elsif (s/^-C(.*)//s) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    $changesfile = $1;
                } elsif (s/^-k(.*)//s) {
                    $keyid=$1;
                } elsif (s/^-wn//s) {
                    $changesfile = $1;
                } elsif (s/^-k(.*)//s) {
                    $keyid=$1;
                } elsif (s/^-wn//s) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    $cleanmode = 'none';
                } elsif (s/^-wg//s) {
                    $cleanmode = 'none';
                } elsif (s/^-wg//s) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    $cleanmode = 'git';
                } elsif (s/^-wd//s) {
                    $cleanmode = 'git';
                } elsif (s/^-wd//s) {

-                   push @ropts, $_;
+                   push @ropts, $&;

                    $cleanmode = 'dpkg-source';
                } else {
                    badusage "unknown short option \`$_'";
                    $cleanmode = 'dpkg-source';
                } else {
                    badusage "unknown short option \`$_'";