X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=d287cfe742cde72567cb011e9d2262b84180b52a;hp=0c024c942c57c0fe5fb3a48e0fcd919447041831;hb=e35c1a88e93f56fd874b5cf222e6037b1eb89ca4;hpb=25a8dc18619262f46043974ad4de5eeaab10bf75

diff --git a/dgit b/dgit
index 0c024c94..d287cfe7 100755
--- 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;
@@ -112,6 +113,9 @@ sub dscfn ($) {
 sub changesopts () { return @changesopts[1..$#changesopts]; }
 
 our $us = 'dgit';
+our $debugprefix = ' ';
+
+sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
 
 sub fail { die "$us: @_\n"; }
 
@@ -132,17 +136,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 +180,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 +218,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 $!;
     }
@@ -221,14 +234,14 @@ sub responder_send_command ($) {
     my ($command) = @_;
     return unless $we_are_responder;
     # called even without $we_are_responder
-    print DEBUG "<< $command\n";
+    printdebug "<< $command\n";
     print $command, "\n" or die $!;
 }    
 
 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 +302,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 $!;
 }
@@ -314,7 +327,7 @@ sub failedcmd {
 }
 
 sub runcmd {
-    printcmd(\*DEBUG,"+",@_) if $debug>0;
+    printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0;
     $!=0; $?=0;
     failedcmd @_ if system @_;
 }
@@ -329,16 +342,16 @@ sub printdone {
 
 sub cmdoutput_errok {
     die Dumper(\@_)." ?" if grep { !defined } @_;
-    printcmd(\*DEBUG,"|",@_) if $debug>0;
+    printcmd(\*DEBUG,$debugprefix."|",@_) if $debug>0;
     open P, "-|", @_ or die $!;
     my $d;
     $!=0; $?=0;
     { local $/ = undef; $d = <P>; }
     die $! if P->error;
-    if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; }
+    if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; }
     chomp $d;
     $d =~ m/^.*/;
-    print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
+    printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
     return $d;
 }
 
@@ -349,7 +362,7 @@ sub cmdoutput {
 }
 
 sub dryrun_report {
-    printcmd(\*STDERR,"#",@_);
+    printcmd(\*STDERR,$debugprefix."#",@_);
 }
 
 sub runcmd_ordryrun {
@@ -371,6 +384,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
@@ -629,9 +643,9 @@ sub get_archive_dsc () {
 	    next;
 	}
 	my $dscfh = new IO::File \$dscdata, '<' or die $!;
-	print DEBUG Dumper($dscdata) if $debug>1;
+	printdebug Dumper($dscdata) if $debug>1;
 	$dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
-	print DEBUG Dumper($dsc) if $debug>1;
+	printdebug Dumper($dsc) if $debug>1;
 	my $fmt = getfield $dsc, 'Format';
 	fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
 	return;
@@ -903,7 +917,7 @@ sub fetch_from_archive () {
     } else {
 	die "$lrref_fn $!";
     }
-    print DEBUG "previous reference hash=$lastpush_hash\n";
+    printdebug "previous reference hash=$lastpush_hash\n";
     my $hash;
     if (defined $dsc_hash) {
 	fail "missing git history even though dsc has hash -".
@@ -937,7 +951,7 @@ Package not found in the archive, but has allegedly been pushed using dgit.
 $later_warning_msg
 END
     } else {
-	print DEBUG "nothing found!\n";
+	printdebug "nothing found!\n";
 	if (defined $skew_warning_vsn) {
 	    print STDERR <<END or die $!;
 
@@ -949,7 +963,7 @@ END
 	}
 	return 0;
     }
-    print DEBUG "current hash=$hash\n";
+    printdebug "current hash=$hash\n";
     if ($lastpush_hash) {
 	fail "not fast forward on last upload branch!".
 	    " (archive's version left in DGIT_ARCHIVE)"
@@ -957,13 +971,13 @@ END
     }
     if (defined $skew_warning_vsn) {
 	mkpath '.git/dgit';
-	print DEBUG "SKEW CHECK WANT $skew_warning_vsn\n";
+	printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
 	my $clogf = ".git/dgit/changelog.tmp";
 	runcmd shell_cmd "exec >$clogf",
 	    @git, qw(cat-file blob), "$hash:debian/changelog";
 	my $gotclogp = parsechangelog("-l$clogf");
 	my $got_vsn = getfield $gotclogp, 'Version';
-	print DEBUG "SKEW CHECK GOT $got_vsn\n";
+	printdebug "SKEW CHECK GOT $got_vsn\n";
 	if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) {
 	    print STDERR <<END or die $!;
 
@@ -1027,7 +1041,7 @@ sub pull () {
 sub check_not_dirty () {
     return if $ignoredirty;
     my @cmd = (@git, qw(diff --quiet HEAD));
-    printcmd(\*DEBUG,"+",@cmd) if $debug>0;
+    printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>0;
     $!=0; $?=0; system @cmd;
     return if !$! && !$?;
     if (!$! && $?==256) {
@@ -1162,7 +1176,7 @@ sub sign_changes ($) {
 }
 
 sub dopush () {
-    print DEBUG "actually entering push\n";
+    printdebug "actually entering push\n";
     prep_ud();
 
     my $clogpfn = ".git/dgit/changelog.822.tmp";
@@ -1182,7 +1196,7 @@ sub dopush () {
     push_parse_dsc("../$dscfn", $dscfn, $cversion);
 
     my $format = getfield $dsc, 'Format';
-    print DEBUG "format $format\n";
+    printdebug "format $format\n";
     if (madformat($format)) {
 	commit_quilty_patch();
     }
@@ -1192,8 +1206,8 @@ sub dopush () {
     runcmd qw(dpkg-source -x --), "../../../../$dscfn";
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     chdir '../../../..' or die $!;
-    printcmd \*DEBUG,"+",@_;
     my @diffcmd = (@git, qw(diff --exit-code), $tree);
+    printcmd \*DEBUG,$debugprefix."+",@diffcmd;
     $!=0; $?=0;
     if (system @diffcmd) {
 	if ($! && $?==256) {
@@ -1386,6 +1400,7 @@ sub cmd_remote_push_responder {
     my ($dir) = @rargs;
     chdir $dir or die "$dir: $!";
     $we_are_responder = 1;
+    $debugprefix = ' ';
     $|=1;
     responder_send_command("dgit-remote-push-ready");
     &cmd_push;
@@ -1420,18 +1435,21 @@ sub cmd_rpush {
     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);
-    my $pid = open2(\*RO, \*RI, @cmd);
+    printcmd \*DEBUG,$debugprefix."+",@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();
@@ -1451,7 +1469,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;
@@ -1469,7 +1487,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;
     }
@@ -1751,35 +1769,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 \`$_'";