git-debrebase: merge: test suite: Drop check of no wreckage save

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index a6a02b113e7d3c9eb21e4a169cdee6f15e9d998e..2a28e720b43d3712fb2910902375fb5113e6370b 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 ($) {
@@ -152,6 +154,14 @@ our $snags_summarised = 0;
 our @deferred_updates;
 our @deferred_update_messages;
 
+sub merge_wreckage_cleaning ($) {
+    my ($updates) = @_;
+    git_for_each_ref("$wrecknoteprefix/*", sub {
+       my ($objid,$objtype,$fullrefname,$reftail) = @_;
+       push @$updates, "delete $fullrefname";
+    });
+}
+
 sub all_snags_summarised () {
     $snags_forced + $snags_tripped == $snags_summarised;
 }
@@ -160,6 +170,7 @@ sub run_deferred_updates ($) {
 
     confess 'dangerous internal error' unless all_snags_summarised();
 
+    merge_wreckage_cleaning \@deferred_updates;
     run_ref_updates_now $mrest, \@deferred_updates;
     print $_, "\n" foreach @deferred_update_messages;
 
@@ -368,6 +379,32 @@ 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;
+       merge_wreckage_cleaning \@updates;
+       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;
@@ -1046,7 +1083,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}, @_); };
@@ -2597,6 +2635,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"