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 };
}
# 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;
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 ($$$) {
my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
- local $workarea = fresh_playground "$playprefix/merge";
+ my $attempt_cmd = sub {
+ debugcmd '+', @_;
+ $!=0; $?=-1;
+ if (system @_) {
+ merge_failed $wrecknotes,
+ failedcmd_waitstatus(),
+ "failed command: @_";
+ }
+ };
+
+ local $workarea;
+ fresh_workarea "merge";
my $seriesfile = "debian/patches/series";
in_workarea sub {
playtree_setup();
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
$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
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);