X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=792e145961edfc1c2920cfe5f69bec2a8a9d523c;hp=f93adefc49e830a09d8422df95673e42099ff1d2;hb=2da706781c3db5e34375a6c3c0b8f72135b70c55;hpb=a1a9073c083036f1c3fd024c3b96ecbccd6b424c

diff --git a/git-debrebase b/git-debrebase
index f93adefc..792e1459 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -362,8 +362,8 @@ sub gbp_pq_export ($$$) {
 #  our own patch identification algorithm?
 #  this is an alternative strategy
 
-sub merge_series ($$;@) {
-    my ($newbase, $base_q, @input_qs) = @_;
+sub merge_series ($$$;@) {
+    my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
     # $base_q{SeriesBase}  $input_qs[]{SeriesBase}
     # $base_q{SeriesTip}   $input_qs[]{SeriesTip}
     # ^ specifies several patch series (currently we only support exactly 2)
@@ -522,7 +522,7 @@ sub merge_series ($$;@) {
 	}
 
 	runcmd @git, qw(add), $seriesfile;
-	runcmd @git, qw(commit --quiet -m), 'Merged series';
+	runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
 
 	printdebug "merge_series series gbp pq import\n";
 	runcmd qw(gbp pq import);
@@ -552,8 +552,8 @@ sub merge_series ($$;@) {
 	runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
 	runcmd @git, qw(add .);
 	runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
-	printdebug sprintf "merge_series done debug=%s\n",
-	    git_rev_parse 'HEAD';
+	my $mdebug = git_rev_parse 'HEAD';
+	printdebug sprintf "merge_series done debug=%s\n", $mdebug;
     };
     printdebug "merge_series returns $result\n";
     return $result;
@@ -1029,6 +1029,11 @@ sub walk ($;$$$) {
 	fail "something useful about failed merge attempt @_ xxx".Dumper($cl);
     };
 
+    my $mwrecknote = sub {
+	my ($reftail, $commitish) = @_;
+	$cl->{MergeWreckNotes}{$reftail} = $commitish;
+    };
+
     my $last_anchor;
 
     for (;;) {
@@ -1178,6 +1183,8 @@ sub walk ($;$$$) {
 
 	    my $ps = $cl->{Parents};
 
+	    $mwrecknote->('vanilla-merge', $cl->{CommitId});
+
 	    foreach my $p (@$ps) {
 		$prline->(" VanillaMerge ".$p->{Ix});
 		$prprdelim->();
@@ -1188,6 +1195,17 @@ sub walk ($;$$$) {
 		$p->{Breakwater} = $p->{SeriesBase} = $pbw;
 		$p->{Anchor} = $panchor;
 
+		my $lr = $p->{LeftRight} = (qw(left right))[$p->{Ix}];
+		$mwrecknote->("$lr-input", $p->{CommitId});
+
+		my $mwrecknote_parent = sub {
+		    my ($which) = @_;
+		    $mwrecknote->("$lr-".(lc $which), $p->{$which});
+		};
+		$mwrecknote_parent->('Laundered');
+		$mwrecknote_parent->('Breakwater');
+		$mwrecknote_parent->('Anchor');
+
 		$best_anchor = $panchor if
 		    !defined $best_anchor or
 		    is_fast_fwd $best_anchor, $panchor;
@@ -1196,6 +1214,8 @@ sub walk ($;$$$) {
 		    " p=$panchor\n";
 	    }
 
+	    $mwrecknote->('result-anchor', $best_anchor);
+
 	    foreach my $p (@$ps) {
 		$prline->(" VanillaMerge ".$p->{Ix});
 		if (!is_fast_fwd $p->{Anchor}, $best_anchor) {
@@ -1242,20 +1262,32 @@ sub walk ($;$$$) {
             @ibs or confess 'internal error, expected anchor at least ?';
 
 	    my $ib;
+	    my $ibleaf;
 	    foreach my $tibix (0..$#ibs) {
 		my $tib = $ibs[$tibix];
 		my $ff = is_fast_fwd $bwb, $tib;
+		my $ok = !$ff ? 'rej' : $ib ? 'extra' : 'ok';
+		my $tibleaf = "interchange-mbcand-$ok-$tibix";
+		$mwrecknote->($tibleaf, $tib);
 		next unless $ff;
 		next if $ib;
 		$ib = $tib;
+		$ibleaf = $tibleaf;
 	    }
 
 	    $ib or $nomerge->("no suitable interchange merge base");
 
 	    $prline->("  VanillaMerge Base");
 	    $prprdelim->();
-	    my ($btip, $bbw, $banchor) =
+	    my ($btip, $bbw, $banchor) = eval {
 		walk $ib, 0, $report, $report_lprefix.'  ';
+	    };
+	    $nomerge->("walking interchange branch merge base ($ibleaf): ".
+		       $@) if length $@;
+
+	    $mwrecknote->("mergebase-laundered", $btip);
+	    $mwrecknote->("mergebase-breakwater", $bbw);
+	    $mwrecknote->("mergebase-anchor", $banchor);
 
 	    my $ibinfo = { SeriesTip => $btip,
 			   SeriesBase => $bbw,
@@ -1264,6 +1296,7 @@ sub walk ($;$$$) {
 		or $nomerge->("interchange merge-base ($ib)'s".
 			      " breakwater ($bbw)".
 			      " != breakwaters' merge-base ($bwb)");
+
 	    grep { $_->{Anchor} eq $ibinfo->{Anchor} } @$ps
 		 or $nomerge->("interchange merge-base ($ib)'s".
 			       " anchor ($ibinfo->{SeriesBase})".
@@ -1271,7 +1304,6 @@ sub walk ($;$$$) {
 			       (join ' ', map { $_->{Anchor} } @$ps).
 			       ")");
 
-
 	    $cl->{MergeInterchangeBaseInfo} = $ibinfo;
 	    $cl->{MergeBestAnchor} = $best_anchor;
 	    push @brw_cl, {
@@ -1360,7 +1392,7 @@ sub walk ($;$$$) {
 	    } elsif ($method eq 'MergeMergeSeries') {
 		print "Running merge resolution for $cl->{CommitId}...\n";
 		$build = merge_series
-		    $build,
+		    $build, $cl->{MergeWreckNotes},
 		    $cl->{MergeInterchangeBaseInfo},
 		    @{ $cl->{Parents} };
 		$last_anchor = $cl->{MergeBestAnchor};