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

diff --git a/git-debrebase b/git-debrebase
index f93adefc..a6a02b11 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -131,6 +131,21 @@ sub fresh_workarea () {
     in_workarea sub { playtree_setup };
 }
 
+sub run_ref_updates_now ($$) {
+    my ($mrest, $updates) = @_;
+    # @$updates is a list of lines for git-update-ref, without \ns
+
+    my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin));
+    debugcmd '>|', @upd_cmd;
+    open U, "|-", @upd_cmd or die $!;
+    foreach (@$updates) {
+	printdebug ">= ", $_, "\n";
+	print U $_, "\n" or die $!;
+    }
+    printdebug ">\$\n";
+    close U or failedcmd @upd_cmd;
+}
+
 our $snags_forced = 0;
 our $snags_tripped = 0;
 our $snags_summarised = 0;
@@ -145,16 +160,7 @@ sub run_deferred_updates ($) {
 
     confess 'dangerous internal error' unless all_snags_summarised();
 
-    my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin));
-    debugcmd '>|', @upd_cmd;
-    open U, "|-", @upd_cmd or die $!;
-    foreach (@deferred_updates) {
-	printdebug ">= ", $_, "\n";
-	print U $_, "\n" or die $!;
-    }
-    printdebug ">\$\n";
-    close U or failedcmd @upd_cmd;
-
+    run_ref_updates_now $mrest, \@deferred_updates;
     print $_, "\n" foreach @deferred_update_messages;
 
     @deferred_updates = ();
@@ -344,7 +350,7 @@ sub gbp_pq_export ($$$) {
 	{ local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
 	failedcmd @gbp_cmd;
     }
-    runcmd @git, qw(add -f debian/patches);
+    runcmd @git, qw(add -f debian/patches) if stat_exists 'debian/patches';
 }
 
 
@@ -362,8 +368,15 @@ sub gbp_pq_export ($$$) {
 #  our own patch identification algorithm?
 #  this is an alternative strategy
 
-sub merge_series ($$;@) {
-    my ($newbase, $base_q, @input_qs) = @_;
+sub mwrecknote ($$$) {
+    my ($wrecknotes, $reftail, $commitish) = @_;
+    confess unless defined $commitish;
+    printdebug "mwrecknote $reftail $commitish\n";
+    $wrecknotes->{$reftail} = $commitish;
+}
+
+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)
@@ -388,6 +401,8 @@ sub merge_series ($$;@) {
 
     my $result;
 
+    my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
+
     local $workarea = fresh_playground "$playprefix/merge";
     my $seriesfile = "debian/patches/series";
     in_workarea sub {
@@ -418,7 +433,7 @@ sub merge_series ($$;@) {
                 " $q->{SeriesTip}]"
             ];
 	    printdebug "merge_series  pec $pec ";
-	    runcmd @git, qw(rm -q --cached), $seriesfile;
+	    runcmd @git, qw(rm -q --ignore-unmatch --cached), $seriesfile;
 	    $pec = make_commit [ $pec ], [
                 "Drop series file from $s to avoid merge trouble",
                 "[git-debrebase merge-innards patch-queue prep:".
@@ -441,6 +456,7 @@ sub merge_series ($$;@) {
 	    printdebug "pec' $pec\n";
             runcmd @git, qw(reset -q --hard), $pec;
 	    $q->{MR}{PEC} = $pec;
+	    $mwrecknote->("$q->{LeftRight}-patchqueue", $pec);
 	}
 	# now, because of reverse, we are on $input_q->{MR}{OQC}
 	runcmd @git, qw(checkout -q -b merge);
@@ -522,7 +538,8 @@ 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';
+	$mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
 
 	printdebug "merge_series series gbp pq import\n";
 	runcmd qw(gbp pq import);
@@ -546,14 +563,17 @@ sub merge_series ($$;@) {
 	    $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
 	}
 	$result = $build;
+	$mwrecknote->('merged-result', $result);
+
 	runcmd @git, qw(update-ref refs/heads/result), $result;
 
 	runcmd @git, qw(checkout -q -b debug);
 	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;
+	$mwrecknote->('merged-debug', $mdebug);
     };
     printdebug "merge_series returns $result\n";
     return $result;
@@ -1029,10 +1049,13 @@ sub walk ($;$$$) {
 	fail "something useful about failed merge attempt @_ xxx".Dumper($cl);
     };
 
+    my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); };
+
     my $last_anchor;
 
     for (;;) {
 	$cl = classify $cur;
+	$cl->{MergeWreckNotes} //= {};
 	my $ty = $cl->{Type};
 	my $st = $cl->{SubType};
 	$prline->("$cl->{CommitId} $cl->{Type}");
@@ -1178,6 +1201,8 @@ sub walk ($;$$$) {
 
 	    my $ps = $cl->{Parents};
 
+	    $mwrecknote->('vanilla-merge', $cl->{CommitId});
+
 	    foreach my $p (@$ps) {
 		$prline->(" VanillaMerge ".$p->{Ix});
 		$prprdelim->();
@@ -1188,6 +1213,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 +1232,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,28 +1280,43 @@ 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,
-			   Anchor => $banchor };
+			   Anchor => $banchor,
+			   LeftRight => 'mergebase' };
+
 	    $bbw eq $bwb
 		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 +1324,6 @@ sub walk ($;$$$) {
 			       (join ' ', map { $_->{Anchor} } @$ps).
 			       ")");
 
-
 	    $cl->{MergeInterchangeBaseInfo} = $ibinfo;
 	    $cl->{MergeBestAnchor} = $best_anchor;
 	    push @brw_cl, {
@@ -1360,7 +1412,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};