X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=e9b2cd54e90a6d29d4d91552dba88516b6d6b713;hb=2193c15cf92d4765da004a310bf684b61718eedf;hp=a8968478059bc35220375c180d6aee2b9533de25;hpb=a2646db69bc0cd6b0fa09a72c5243ac2126f57e8;p=dgit.git

diff --git a/dgit b/dgit
index a8968478..e9b2cd54 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;
@@ -473,6 +473,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
@@ -977,9 +978,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',
@@ -997,8 +997,6 @@ sub determine_whether_split_brain () {
 	$do_split_brain = 1;
     }
     $do_split_brain //= 0;
-
-    return ($format);
 }
 
 sub supplementary_message ($) {
@@ -4684,6 +4682,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");
     }
@@ -4887,7 +4886,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
@@ -5196,6 +5195,13 @@ sub i_resp_want ($) {
 	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;
@@ -6576,7 +6582,8 @@ sub build_or_push_prep_early () {
 }
 
 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)"