git-debrebase: fresh_workarea: Support $subdir

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 464a14c4bb03bab5a0c7c8b7adc944e3387a555c..3ac087c980034a3a4812b97ec6d8a5b21c4b1e07 100755 (executable)
--- 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,10 +381,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;
 
@@ -443,12 +446,14 @@ sub merge_series ($$$;@) {
        debugcmd '+', @_;
        $!=0; $?=-1;
        if (system @_) {
-           failedcmd_report_cmd undef, @_;
-           merge_failed $wrecknotes, failedcmd_waitstatus();
+           merge_failed $wrecknotes,
+               failedcmd_waitstatus(),
+               "failed command: @_";
        }
     };
 
-    local $workarea = fresh_playground "$playprefix/merge";
+    local $workarea;
+    fresh_workarea "merge";
     my $seriesfile = "debian/patches/series";
     in_workarea sub {
        playtree_setup();
@@ -1344,8 +1349,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);