git-debrebase: merge: test suite: Check wreckage saving

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 563fb9970fa4f7bb8f7ac46c4d7b583e8d68f36a..589fa901af95f5b1158f850b205e9defc20331ac 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -51,10 +51,12 @@ See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).
 END
 
 our ($opt_force, $opt_noop_ok, @opt_anchors);
-our ($opt_defaultcmd_interactive);
+our ($opt_defaultcmd_interactive, $opt_save_wreckage);
 
 our $us = qw(git-debrebase);
 
+our $wrecknoteprefix = 'refs/debrebase-wreckage';
+
 $|=1;
 
 sub badusage ($) {
@@ -368,9 +370,39 @@ sub gbp_pq_export ($$$) {
 #  our own patch identification algorithm?
 #  this is an alternative strategy
 
+sub merge_failed ($$) {
+    my ($wrecknotes, $emsg) = @_;
+    my @m;
+    push @m, "Merge resolution failed: $emsg";
+
+    $opt_save_wreckage //= do {
+       my $c = cfg 'git-debrebase.merge.save-wreckage', 1;
+       # ^ xxx documentation
+       $c && $c =~ m/^[1ty]/;
+    };
+
+    if ($opt_save_wreckage) {
+       my @updates;
+       git_for_each_ref("$wrecknoteprefix/*", sub {
+            my ($objid,$objtype,$fullrefname,$reftail) = @_;
+            push @updates, "delete $fullrefname";
+        });
+       keys %$wrecknotes;
+       while (my ($k,$v) = each %$wrecknotes) {
+           push @updates, "create $wrecknoteprefix/$k $v";
+       }
+       run_ref_updates_now "merge failed", \@updates;
+       push @m, "Wreckage left in $wrecknoteprefix/* as requested.";
+    }
+    push @m, "See git-debrebase(1) section FAILED MERGES for suggestions.";
+    # ^ xxx this section does not yet exist
+    fail join '', map { "$_\n" } @m;
+}
+
 sub mwrecknote ($$$) {
     my ($wrecknotes, $reftail, $commitish) = @_;
     confess unless defined $commitish;
+    printdebug "mwrecknote $reftail $commitish\n";
     $wrecknotes->{$reftail} = $commitish;
 }
 
@@ -1045,7 +1077,8 @@ sub walk ($;$$$) {
     };
 
     my $nomerge = sub {
-       fail "something useful about failed merge attempt @_ xxx".Dumper($cl);
+       my ($emsg) = @_;
+       merge_failed $cl->{MergeWreckNotes}, $emsg;
     };
 
     my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); };
@@ -2596,6 +2629,7 @@ getoptions_main
           'anchor=s' => \@opt_anchors,
           '--dgit=s' => \($dgit[0]),
           'force!',
+          '--save-wreckage', \$opt_save_wreckage,
           '-i:s' => sub {
               my ($opt,$val) = @_;
               badusage "git-debrebase: no cuddling to -i for git-rebase"