X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=eee1806c74eb484de11007fec42daed71fba4997;hb=584d67c264bfc9d759a5fc40f04cde62d3b0ec76;hp=f6c845d967da3d2083890f9ff832f999204ac00d;hpb=a0fafdb431fa23f6de127a8d38a62ccfc12f3537;p=dgit.git

diff --git a/dgit b/dgit
index f6c845d9..eee1806c 100755
--- a/dgit
+++ b/dgit
@@ -73,6 +73,7 @@ our $dodep14tag;
 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;
@@ -2842,8 +2843,10 @@ END
     };
 
     if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
-	my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
-	$mapref = $lrf.'/'.$rewritemap;
+	if (!defined $mapref) {
+	    my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
+	    $mapref = $lrf.'/'.$rewritemap;
+	}
 	my $rewritemapdata = git_cat_file $mapref.':map';
 	if (defined $rewritemapdata
 	    && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
@@ -3816,8 +3819,12 @@ sub push_parse_changelog ($) {
     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);
 
@@ -4002,6 +4009,7 @@ END
     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";
@@ -4130,6 +4138,7 @@ END
     responder_send_file('changes',$changesfile);
     responder_send_command("param head $dgithead");
     responder_send_command("param csuite $csuite");
+    responder_send_command("param isuite $isuite");
     responder_send_command("param tagformat $tagformat");
     if (defined $maintviewhead) {
 	die unless ($protovsn//4) >= 4;
@@ -4299,7 +4308,8 @@ sub fetchpullargs () {
 	$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;
@@ -4331,7 +4341,6 @@ END
 
 sub cmd_push {
     parseopts();
-    pushing();
     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();
@@ -4344,6 +4353,7 @@ sub cmd_push {
 	badusage "incorrect arguments to dgit push";
     }
     $isuite = getfield $clogp, 'Distribution';
+    pushing();
     if ($new_package) {
 	local ($package) = $existing_package; # this is a hack
 	canonicalise_suite();
@@ -4374,8 +4384,6 @@ sub cmd_remote_push_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 $!;
@@ -4394,7 +4402,6 @@ sub cmd_remote_push_build_host {
 	unless defined $protovsn;
 
     responder_send_command("dgit-remote-push-ready $protovsn");
-    rpush_handle_protovsn_bothends();
     changedir $dir;
     &cmd_push;
 }
@@ -4436,7 +4443,6 @@ sub i_method {
 }
 
 sub cmd_rpush {
-    pushing();
     my $host = nextarg;
     my $dir;
     if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
@@ -4456,6 +4462,8 @@ sub cmd_rpush {
     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: $!";
@@ -4469,11 +4477,6 @@ sub cmd_rpush {
     die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
     $supplementary_message = '' unless $protovsn >= 3;
 
-    fail "rpush negotiated protocol version $protovsn".
-	" which does not support quilt mode $quilt_mode"
-	if quiltmode_splitbrain;
-
-    rpush_handle_protovsn_bothends();
     for (;;) {
 	my ($icmd,$iargs) = initiator_expect {
 	    m/^(\S+)(?: (.*))?$/;
@@ -4537,6 +4540,18 @@ our %i_wanted;
 sub i_resp_want ($) {
     my ($keyword) = @_;
     die "$keyword ?" if $i_wanted{$keyword}++;
+    
+    defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
+    $isuite = $i_param{'isuite'} // $i_param{'csuite'};
+    die unless $isuite =~ m/^$suite_re$/;
+
+    pushing();
+    rpush_handle_protovsn_bothends();
+
+    fail "rpush negotiated protocol version $protovsn".
+	" which does not support quilt mode $quilt_mode"
+	if quiltmode_splitbrain;
+
     my @localpaths = i_method "i_want", $keyword;
     printdebug "[[  $keyword @localpaths\n";
     foreach my $localpath (@localpaths) {
@@ -5415,6 +5430,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
+    runcmd @git, qw(checkout -f), $headref, qw(-- debian);
     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";
 
@@ -6089,6 +6105,8 @@ Specify  +$specbranch to overwrite, discarding existing history
 END
 	if $oldhash && !$force;
 
+    notpushing();
+
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};