X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=7f96749626f94cd7e0848eb9b75aa8613a3c3b9c;hp=213728023f249305eb873722d305f3168a1cb0c4;hb=60d8dcb7dc0e8e8463fe1a7728dd4114b3d3e52e;hpb=eec3f8c097bdb3f03499c9228f42d5cd2ce65786

diff --git a/git-debrebase b/git-debrebase
index 21372802..7f967496 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -379,10 +379,11 @@ 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;
 
@@ -396,8 +397,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 ($$$) {
@@ -435,6 +440,16 @@ sub merge_series ($$$;@) {
 
     my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
 
+    my $attempt_cmd = sub {
+	debugcmd '+', @_;
+	$!=0; $?=-1;
+	if (system @_) {
+	    merge_failed $wrecknotes,
+		failedcmd_waitstatus(),
+		"failed command: @_";
+	}
+    };
+
     local $workarea = fresh_playground "$playprefix/merge";
     my $seriesfile = "debian/patches/series";
     in_workarea sub {
@@ -494,11 +509,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
@@ -574,7 +586,8 @@ sub merge_series ($$$;@) {
 	$mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
 
 	printdebug "merge_series series gbp pq import\n";
-	runcmd qw(gbp pq import);
+
+	$attempt_cmd->(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
@@ -1333,8 +1346,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);