diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:26:41 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:26:19 +0100 |
commit | 5ad9edffc1e0658f287b45feccbd7c97e0bfd412 (patch) | |
tree | d0afb5f51ebac1469e5f71e78743f01c19f21d71 /git-debrebase | |
parent | a31d506d5ba29726b661ecd40092c8fbebfa865f (diff) |
git-debrebase: merge: New record-resolved-merge subcommand, WIP
Right now this seems to be able to generate some commit, but
it doesn't know how to record it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 0dea5d5..a9abfa0 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2611,6 +2611,45 @@ END 'convert-from-dgit-view'; } +sub cmd_record_resolved_merge () { + badusage "record-resolved-merge takes no further arguments" if @ARGV; + my $new = get_head(); + my $method; + + print "Checking how you have resolved the merge problem\n"; + my $nope = sub { print "Not $method: @_"; 0; }; + + my $maybe = sub { print "Seems to be $method.\n"; }; + my $yes = sub { + my ($key, $ref) = @_; + print "OK. You can switch branches and try git-debrebase again.\n"; + confess "todo $ref"; # xxx + 1; + }; + + fresh_workarea 'merge'; + sub { + $method = 'vanilla-merge patchqueue'; + my $vanilla = git_get_ref "$wrecknoteprefix/vanilla-merge"; + $vanilla or return $nope->("wreckage was not of vanilla-merge"); + foreach my $lr (qw(left right)) { + my $n = "$wrecknoteprefix/$lr-patchqueue"; + my $lrpq = git_get_ref $n; + $lrpq or return $nope->("wreckage did not contain patchqueues"); + is_fast_fwd $lrpq, $new or return $nope->("HEAD not ff of $n"); + } + $maybe->(); + my $newbase = git_get_ref "$wrecknoteprefix/new-base" + or die "wreckage element $wrecknoteprefix/new-base missing"; + my $result = merge_series_patchqueue_convert + {}, $newbase, $new; + $yes->("vanilla-merge $vanilla", $result); + 1; + }->() or sub { + fail "No resolved merge method seems applicable.\n"; + }->(); +} + sub cmd_downstream_rebase_launder_v0 () { badusage "needs 1 argument, the baseline" unless @ARGV==1; my ($base) = @ARGV; |