X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=6bb1f488d6a01c8eee5cf130863dd7a8027f1faa;hb=6a31b9ee6cf62f1d78c307213c88064d4efb8d24;hp=de53faa381c8a2574bbbde96f332d19a6218f2c1;hpb=c862568af896b84dce9c6581907abd3244e54dfb;p=dgit.git

diff --git a/dgit b/dgit
index de53faa3..6bb1f488 100755
--- a/dgit
+++ b/dgit
@@ -53,7 +53,7 @@ use Debian::Dgit;
 our $our_version = 'UNRELEASED'; ###substituted###
 our $absurdity = undef; ###substituted###
 
-our @rpushprotovsn_support = qw(4 5); # 5 drops tag format specification
+our @rpushprotovsn_support = qw(6 5 4); # Reverse order!
 our $protovsn;
 
 our $cmd;
@@ -104,7 +104,6 @@ our %forceopts = map { $_=>0 }
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
-our $suite_re = '[-+.0-9a-z]+';
 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
                      | (?: git | git-ff ) (?: ,always )?
                          | check (?: ,ignores )?
@@ -300,6 +299,10 @@ sub deliberately_not_fast_forward () {
 sub quiltmode_splitting () {
     $quilt_mode =~ m/gbp|dpm|unapplied|baredebian/;
 }
+sub format_quiltmode_splitting ($) {
+    my ($format) = @_;
+    return madformat_wantfixup($format) && quiltmode_splitting();
+}
 
 sub do_split_brain () { !!($do_split_brain // confess) }
 
@@ -469,6 +472,7 @@ sub branch_is_gdr ($) {
 #  > param head DGIT-VIEW-HEAD
 #  > param csuite SUITE
 #  > param tagformat new              # $protovsn == 4
+#  > param splitbrain 0|1             # $protovsn >= 6
 #  > param maint-view MAINT-VIEW-HEAD
 #
 #  > param buildinfo-filename P_V_X.buildinfo   # zero or more times
@@ -973,9 +977,8 @@ sub notpushing () {
     parseopts_late_defaults();
 }
 
-sub determine_whether_split_brain () {
-    my ($format,) = get_source_format();
-
+sub determine_whether_split_brain ($) {
+    my ($format) = @_;
     {
 	local $access_forpush;
 	default_from_access_cfg(\$splitview_mode, 'split-view', 'auto',
@@ -985,7 +988,7 @@ sub determine_whether_split_brain () {
 
     printdebug "format $format, quilt mode $quilt_mode\n";
 
-    if (madformat_wantfixup($format) && quiltmode_splitting()) {
+    if (format_quiltmode_splitting $format) {
 	$splitview_mode ne 'never' or
 	    fail f_ "dgit: quilt mode \`%s' (for format \`%s')".
 	            " implies split view, but split-view set to \`%s'",
@@ -993,8 +996,6 @@ sub determine_whether_split_brain () {
 	$do_split_brain = 1;
     }
     $do_split_brain //= 0;
-
-    return ($format);
 }
 
 sub supplementary_message ($) {
@@ -4357,11 +4358,11 @@ sub push_mktags ($$ $$ $) {
 
     my $cversion = getfield $clogp, 'Version';
     my $clogsuite = getfield $clogp, 'Distribution';
+    my $format = getfield $dsc, 'Format';
 
     # 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;
-    my $dtxinfo = join(" ", "",@deliberatelies);
 
     my $mktag = sub {
 	my ($tw) = @_;
@@ -4377,19 +4378,28 @@ tag $tag
 tagger $authline
 
 END
+
+	my @dtxinfo = @deliberatelies;
+	unshift @dtxinfo, "--quilt=$quilt_mode" if madformat($format);
+	unshift @dtxinfo, do_split_brain() ? "split" : "no-split"
+	    # rpush protocol 5 and earlier don't tell us
+	    unless $we_are_initiator && $protovsn < 6;
+	my $dtxinfo = join(" ", "",@dtxinfo);
+	my $tag_metadata = <<END;
+[dgit distro=$declaredistro$dtxinfo]
+END
+	foreach my $ref (sort keys %previously) {
+	    $tag_metadata .= <<END or confess "$!";
+[dgit previously:$ref=$previously{$ref}]
+END
+	}
+
 	if ($tw->{View} eq 'dgit') {
 	    print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
 %s release %s for %s (%s) [dgit]
 ENDT
 		or confess "$!";
-	    print TO <<END or confess "$!";
-[dgit distro=$declaredistro$dtxinfo]
-END
-	    foreach my $ref (sort keys %previously) {
-		print TO <<END or confess "$!";
-[dgit previously:$ref=$previously{$ref}]
-END
-	    }
+	    print TO $tag_metadata;
 	} elsif ($tw->{View} eq 'maint') {
 	    print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
 %s release %s for %s (%s)
@@ -4678,6 +4688,7 @@ ENDT
     responder_send_command("param csuite $csuite");
     responder_send_command("param isuite $isuite");
     responder_send_command("param tagformat new"); # needed in $protovsn==4
+    responder_send_command("param splitbrain $do_split_brain");
     if (defined $maintviewhead) {
 	responder_send_command("param maint-view $maintviewhead");
     }
@@ -4881,7 +4892,7 @@ sub cmd_fetch {
 sub cmd_pull {
     parseopts();
     fetchpullargs();
-    determine_whether_split_brain();
+    determine_whether_split_brain get_source_format();
     if (do_split_brain()) {
 	my ($format, $fopts) = get_source_format();
 	madformat($format) and fail f_ <<END, $quilt_mode
@@ -5176,6 +5187,7 @@ sub i_resp_previously ($) {
 }
 
 our %i_wanted;
+our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
 
 sub i_resp_want ($) {
     my ($keyword) = @_;
@@ -5185,8 +5197,18 @@ sub i_resp_want ($) {
     $isuite = $i_param{'isuite'} // $i_param{'csuite'};
     die unless $isuite =~ m/^$suite_re$/;
 
-    pushing();
-    rpush_handle_protovsn_bothends();
+    if (!defined $dsc) {
+	pushing();
+	rpush_handle_protovsn_bothends();
+	push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
+	if ($protovsn >= 6) {
+	    determine_whether_split_brain getfield $dsc, 'Format';
+	    $do_split_brain eq ($i_param{'splitbrain'} // '<unsent>')
+		or badproto \*RO,
+ "split brain mismatch, $do_split_brain != $i_param{'split_brain'}";
+	    printdebug "rpush split brain $do_split_brain\n";
+	}
+    }
 
     my @localpaths = i_method "i_want", $keyword;
     printdebug "[[  $keyword @localpaths\n";
@@ -5196,8 +5218,6 @@ sub i_resp_want ($) {
     print RI "files-end\n" or confess "$!";
 }
 
-our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
-
 sub i_localname_parsed_changelog {
     return "remote-changelog.822";
 }
@@ -5265,7 +5285,7 @@ sub i_want_signed_tag {
 
     die unless $i_param{'csuite'} =~ m/^$suite_re$/;
     $csuite = $&;
-    push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
+    defined $dsc or badproto \*RO, "dsc (before parsed-changelog)";
 
     my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
 
@@ -6558,17 +6578,21 @@ sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
 sub build_or_push_prep_early () {
     our $build_or_push_prep_early_done //= 0;
     return if $build_or_push_prep_early_done++;
-    badusage f_ "-p is not allowed with dgit %s", $subcommand
-	if defined $package;
     my $clogp = parsechangelog();
     $isuite = getfield $clogp, 'Distribution';
-    $package = getfield $clogp, 'Source';
+    my $gotpackage = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+    $package //= $gotpackage;
+    if ($package ne $gotpackage) {
+	fail f_ "-p specified package %s, but changelog says %s",
+	    $package, $gotpackage;
+    }
     $dscfn = dscfn($version);
 }
 
 sub build_or_push_prep_modes () {
-    my ($format,) = determine_whether_split_brain();
+    my ($format) = get_source_format();
+    determine_whether_split_brain($format);
 
     fail __ "dgit: --include-dirty is not supported with split view".
             " (including with view-splitting quilt modes)"