X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=1e8de52941e10f68a80dc244642925ac0169cbd4;hp=4f9a9bb98e21bbe6a5e46ddbc3adc262173d7fce;hb=3522f98a237df1650a2361f3545e36396bc6c797;hpb=cfbec7a706fd1f631ebbed0c545980590eb26656

diff --git a/git-debrebase b/git-debrebase
index 4f9a9bb9..1e8de529 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -395,8 +395,8 @@ sub merge_series ($$;@) {
 	foreach my $q ($base_q, reverse @input_qs) {
 	    my $s = $q->{MR}{S};
 	    gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
+	    my @earlier;
 	    if (open S, $seriesfile) {
-		my @earlier;
 		while (my $patch = <S>) {
 		    chomp $patch or die $!;
 		    $prereq{$patch} //= {};
@@ -424,6 +424,20 @@ sub merge_series ($$;@) {
                 "[git-debrebase merge-innards patch-queue prep:".
                 " $q->{SeriesTip}]"
             ];
+
+	    read_tree_debian $newbase;
+	    if (@earlier) {
+		read_tree_subdir 'debian/patches', "$pec:debian/patches";
+	    } else {
+		rm_subdir_cached 'debian/patches';
+	    }
+	    $pec = make_commit [ $pec ], [
+ "Update debian/ (excluding patches) to final to avoid re-merging",
+ "debian/ was already merged and we need to just take that.",
+                "[git-debrebase merge-innards patch-queue packaging:".
+                " $q->{SeriesTip}]"
+            ];
+
 	    printdebug "pec' $pec\n";
             runcmd @git, qw(reset -q --hard), $pec;
 	    $q->{MR}{PEC} = $pec;
@@ -522,7 +536,7 @@ sub merge_series ($$;@) {
 	foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) {
 	    my $commit = git_cat_file $c, 'commit';
 	    printdebug "merge_series series ok, building $c\n";
-	    read_tree_upstream $c;
+	    read_tree_upstream $c, 0, $newbase;
 	    my $tree = cmdoutput @git, qw(write-tree);
 	    $commit =~ s{^parent (\S+)$}{parent $build}m or confess;
 	    $commit =~ s{^tree (\S+)$}{tree $tree}m      or confess;
@@ -832,6 +846,8 @@ sub mergedbreakwaters_anchor ($) {
 	$best_anchor = $panchor
 	    if !defined $best_anchor
 	    or is_fast_fwd $best_anchor, $panchor;
+	fail "inconsistent anchors in merged-breakwaters $p->{CommitId}"
+	    unless is_fast_fwd $panchor, $best_anchor;
     }
     return $best_anchor;
 }
@@ -1116,7 +1132,11 @@ sub walk ($;$$$) {
 		return $bomb->();
 	    }
 	    die "$ty ?";
-	} elsif ($ty eq 'VanillaMerge' or $ty eq 'MergedBreakwaters') {
+	} elsif ($ty eq 'MergedBreakwaters') {
+	    $last_anchor = mergedbreakwaters_anchor $cl;
+	    $build_start->(' MergedBreakwaters', $cur);
+	    last;
+	} elsif ($ty eq 'VanillaMerge') {
 	    # User may have merged unstitched branch(es).  We will
 	    # have now lost what ffq-prev was then (since the later
 	    # pseudomerge may introduce further changes).  The effect
@@ -1152,9 +1172,6 @@ sub walk ($;$$$) {
 
 	    printdebug "*** MERGE\n";
 
-	    # xxx avoid calling walk without nogenerate when
-	    # we have a MergedBreakwater; instead call keycommits ?
-
 	    my @bwbcmd = (@git, qw(merge-base));
 	    my @ibcmd = (@git, qw(merge-base --all));
 	    my $might_be_in_bw = 1;
@@ -1182,7 +1199,7 @@ sub walk ($;$$$) {
 	    foreach my $p (@$ps) {
 		$prline->(" VanillaMerge ".$p->{Ix});
 		if (!is_fast_fwd $p->{Anchor}, $best_anchor) {
-		    $nomerge->('DivergentAnchor');
+		    $nomerge->('divergent anchors');
 		} elsif ($p->{Anchor} eq $best_anchor) {
 		    print $report " SameAnchor" if $report;
 		} else {
@@ -1200,14 +1217,14 @@ sub walk ($;$$$) {
 	    }
 
 	    if ($ok && $might_be_in_bw) {
+		# We could rewrite this to contaion the metadata
+		# declaring it to be MergedBreakwaters, but
+		# unnecessarily rewriting a merge seems unhelpful.
 		$prline->(" VanillaMerge MergedBreakwaters");
 		$last_anchor = $best_anchor;
 		$build_start->('MergedBreakwaters', $cur);
 	    }
 
-	    $nomerge->("alleged merged-breakwater is not a breakwater")
-		unless $ty eq 'VanillaMerge';
-
 	    my $bwb = cmdoutput @bwbcmd;
 
 	    # OK, now we have a breakwater base, but we need the merge
@@ -1276,6 +1293,11 @@ sub walk ($;$$$) {
 
     my $rewriting = 0;
 
+    my $read_tree_upstream = sub {
+	my ($treeish) = @_;
+	read_tree_upstream $treeish, 0, $build;
+    };
+
     $#upp_cl = $upp_limit if defined $upp_limit;
  
     my $committer_authline = calculate_committer_authline();
@@ -1303,7 +1325,7 @@ sub walk ($;$$$) {
 	    if ($method eq 'Debian') {
 		read_tree_debian($cltree);
 	    } elsif ($method eq 'Upstream') {
-		read_tree_upstream($cltree);
+		$read_tree_upstream->($cltree);
 	    } elsif ($method eq 'StartRewrite') {
 		$rewriting = 1;
 		next;
@@ -1316,13 +1338,13 @@ sub walk ($;$$$) {
  		confess unless $rewriting;
 		my $differs = (get_differs $build, $cltree);
 		next unless $differs & D_UPS;
-		read_tree_upstream($cltree);
+		$read_tree_upstream->($cltree);
 		push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
 	    } elsif ($method eq 'MergeCreateMergedBreakwaters') {
 		print "Found a general merge, will try to tidy it up.\n";
 		$rewriting = 1;
-		read_tree_upstream($cl->{MergeBestAnchor});
-		read_tree_upstream($cl->{MergeBestAnchor});
+		$read_tree_upstream->($cl->{MergeBestAnchor});
+		$read_tree_upstream->($cl->{MergeBestAnchor});
 		read_tree_debian($cltree);
 		@parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
 	    } elsif ($method eq 'MergeMergeSeries') {
@@ -1332,16 +1354,29 @@ sub walk ($;$$$) {
 		    $cl->{MergeInterchangeBaseInfo},
 		    @{ $cl->{Parents} };
 		$last_anchor = $cl->{MergeBestAnchor};
-		my $check_differs = get_differs $build, $cl->{CommitId};
+
+		# Check for mismerges:
+		my $check = sub {
+		    my ($against, $allow, $what) = @_;
+		    my $differs = get_differs $build, $against;
+		    $nomerge->(sprintf
+       "merge misresolved: %s are not the same (%s %s d.%#x)",
+			       $what, $against, $build, $differs)
+			if $differs & ~($allow | D_PAT_ADD);
+		};
+
 		# Breakwater changes which were in each side of the
-		# merge should be in MergeCreateMergedBreakwaters
-		# output.  Upstream changes are exactly the result
-		# of merge_series.  So the only difference should
-		# be potential laundry results.
-		$nomerge->(sprintf
-                    "merge misresolved: tree is not the same (%s %s d.%#x)",
-			   $cl->{CommitId}, $build, $check_differs)
-		    if $check_differs & ~D_PAT_ADD;
+		# merge will have been incorporated into the
+		# MergeCreateMergedBreakwaters output.  Because the
+		# upstream series was rebased onto the new breakwater,
+		# so should all of the packaging changes which were in
+		# the input.
+		$check->($input, D_UPS, 'debian files');
+
+		# Upstream files are merge_series, which ought to
+		# have been identical to the original merge.
+		$check->($cl->{CommitId}, DS_DEB, 'upstream files');
+
 		print "Merge resolution successful.\n";
 		next;
 	    } else {