X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=910e444df28aca907c99b7ac56c63cd32f65ccf7;hp=213728023f249305eb873722d305f3168a1cb0c4;hb=e8ac0f9218a53a4dab9e2e1efe0ec696b6484011;hpb=eec3f8c097bdb3f03499c9228f42d5cd2ce65786

diff --git a/git-debrebase b/git-debrebase
index 21372802..910e444d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -128,8 +128,10 @@ sub in_workarea ($) {
     die $@ if $@;
 }
 
-sub fresh_workarea () {
-    $workarea = fresh_playground "$playprefix/work";
+sub fresh_workarea (;$) {
+    my ($subdir) = @_;
+    $subdir //= 'work';
+    $workarea = fresh_playground "$playprefix/$subdir";
     in_workarea sub { playtree_setup };
 }
 
@@ -379,15 +381,19 @@ sub gbp_pq_export ($$$) {
 #  our own patch identification algorithm?
 #  this is an alternative strategy
 
-sub merge_failed ($$) {
-    my ($wrecknotes, $emsg) = @_;
+sub merge_failed ($$;@) {
+    my ($wrecknotes, $emsg, @xmsgs) = @_;
     my @m;
     push @m, "Merge resolution failed: $emsg";
+    push @m, @xmsgs;
 
     changedir $maindir;
 
     my @updates;
     merge_wreckage_cleaning \@updates;
+    run_ref_updates_now "merge failed", \@updates;
+
+    @updates = ();
     keys %$wrecknotes;
     while (my ($k,$v) = each %$wrecknotes) {
 	push @updates, "create $wrecknoteprefix/$k $v";
@@ -396,8 +402,12 @@ sub merge_failed ($$) {
     push @m, "Wreckage left in $wrecknoteprefix/*.";
 
     push @m, "See git-debrebase(1) section FAILED MERGES for suggestions.";
-    # ^ xxx this section does not yet exist
-    fail join '', map { "$_\n" } @m;
+
+    # use finish rather than fail, in case we are within an eval
+    # (that can happen inside walk!)
+    print STDERR "\n";
+    print STDERR "$us: $_\n" foreach @m;
+    finish 15;
 }
 
 sub mwrecknote ($$$) {
@@ -407,6 +417,17 @@ sub mwrecknote ($$$) {
     $wrecknotes->{$reftail} = $commitish;
 }
 
+sub merge_attempt_cmd {
+    my $wrecknotes = shift @_;
+    debugcmd '+', @_;
+    $!=0; $?=-1;
+    if (system @_) {
+	merge_failed $wrecknotes,
+	    failedcmd_waitstatus(),
+	    "failed command: @_";
+    }
+}
+
 sub merge_series ($$$;@) {
     my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
     # $base_q{SeriesBase}  $input_qs[]{SeriesBase}
@@ -432,10 +453,14 @@ sub merge_series ($$$;@) {
     # $prereq{<patch filename>}               exists or not (even later)
 
     my $result;
+    my $merged_pq;
 
     my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
 
-    local $workarea = fresh_playground "$playprefix/merge";
+    my $attempt_cmd = sub { &merge_attempt_cmd($wrecknotes, @_); };
+
+    local $workarea;
+    fresh_workarea "merge";
     my $seriesfile = "debian/patches/series";
     in_workarea sub {
 	playtree_setup();
@@ -494,11 +519,8 @@ sub merge_series ($$$;@) {
 	runcmd @git, qw(checkout -q -b merge);
 	printdebug "merge_series merging...\n";
 	my @mergecmd = (@git, qw(merge --quiet --no-edit), "p-1");
-	debugcmd '+', @mergecmd;
-	$!=0; $?=-1;
-	if (system @mergecmd) {
-	    failedcmd @mergecmd;
-	}
+
+	$attempt_cmd->(@mergecmd);
 
 	printdebug "merge_series merge ok, series...\n";
 	# We need to construct a new series file
@@ -571,17 +593,20 @@ sub merge_series ($$$;@) {
 
 	runcmd @git, qw(add), $seriesfile;
 	runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
-	$mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
+	$merged_pq = git_rev_parse 'HEAD';
+	$mwrecknote->('merged-patchqueue', $merged_pq);
 
 	printdebug "merge_series series gbp pq import\n";
-	runcmd qw(gbp pq import);
+	runcmd @git, qw(checkout -q -b mergec), $merged_pq;
+
+	merge_attempt_cmd($wrecknotes, qw(gbp pq import));
 
 	# OK now we are on patch-queue/merge, and we need to rebase
 	# onto the intended parent and drop the patches from each one
 
 	printdebug "merge_series series ok, building...\n";
 	my $build = $newbase;
-	my @lcmd = (@git, qw(rev-list --reverse merge..patch-queue/merge));
+	my @lcmd = (@git, qw(rev-list --reverse mergec..patch-queue/mergec));
 	foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) {
 	    my $commit = git_cat_file $c, 'commit';
 	    printdebug "merge_series series ok, building $c\n";
@@ -595,7 +620,7 @@ sub merge_series ($$$;@) {
 	    $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
 	}
 	$result = $build;
-	$mwrecknote->('merged-result', $result);
+	mwrecknote($wrecknotes, 'merged-result', $result);
 
 	runcmd @git, qw(update-ref refs/heads/result), $result;
 
@@ -605,7 +630,7 @@ sub merge_series ($$$;@) {
 	runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
 	my $mdebug = git_rev_parse 'HEAD';
 	printdebug sprintf "merge_series done debug=%s\n", $mdebug;
-	$mwrecknote->('merged-debug', $mdebug);
+	mwrecknote($wrecknotes, 'merged-debug', $mdebug);
     };
     printdebug "merge_series returns $result\n";
     return $result;
@@ -1333,8 +1358,9 @@ sub walk ($;$$$) {
 	    my ($btip, $bbw, $banchor) = eval {
 		walk $ib, 0, $report, $report_lprefix.'  ';
 	    };
-	    $nomerge->("walking interchange branch merge base ($ibleaf): ".
-		       $@) if length $@;
+	    $nomerge->("walking interchange branch merge base ($ibleaf):\n".
+		       $@)
+		if length $@;
 
 	    $mwrecknote->("mergebase-laundered", $btip);
 	    $mwrecknote->("mergebase-breakwater", $bbw);
@@ -1444,6 +1470,7 @@ sub walk ($;$$$) {
 		@parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
 	    } elsif ($method eq 'MergeMergeSeries') {
 		print "Running merge resolution for $cl->{CommitId}...\n";
+		$mwrecknote->('new-base', $build);
 		$build = merge_series
 		    $build, $cl->{MergeWreckNotes},
 		    $cl->{MergeInterchangeBaseInfo},