From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>,
"B. Stebler" <bono.stebler@gmail.com>,
git@vger.kernel.org
Subject: Re: Improving merge of tricky conflicts
Date: Thu, 23 Jul 2020 14:25:49 -0400 [thread overview]
Message-ID: <20200723182549.GB3975154@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqmu3r5umr.fsf@gitster.c.googlers.com>
On Wed, Jul 22, 2020 at 10:26:04AM -0700, Junio C Hamano wrote:
> > The big downside here, of course, is that it's showing the diff for the
> > whole file, not just one hunk (on the other hand, I often find the
> > trickiest conflicts are ones where the changes unexpectedly span
> > multiple hunks).
>
> Yup, I often find myself comparing the base part (lines between |||
> and ===) with our part (lines between <<< and |||) and their part
> (lines between === and >>>) while looking at the diff3 output to see
> what unique change each side did, in order to come up with a
> conflict resolution.
>
> I do this often enough to wonder if I should write a small "filter"
> that I can pipe a whole "diff3" <<< ... ||| ... === ... >>> region
> to and convert it into to diffs, but not often enough to motivate
> me to actually write one ;-).
I would definitely have found that useful before (usually when one side
made a tiny one-line change and the other side deleted or drastically
changed a huge chunk).
It might even be possible to stuff it into xdiff's fill_conflict_hunk().
We have all of the data there, and xdiff in theory can make diffs. :) It
might be easier to prototype it as an external filter, though.
Something like the script below seems to work; you can run whole files
through it, or do something like ":10,20r!perl foo.pl" in vim to filter
a snippet. I won't be at all surprised if somebody more familiar with
vim tells me that you can already do something way better than this
(I've always found vimdiff pretty confusing).
-- >8 --
#!/usr/bin/perl
use File::Temp;
use strict;
my (@base, @ours, @theirs);
my $state;
sub flush {
print @ours;
print "|||||||\n";
show_diff(base => \@base, ours => \@ours);
print "|||||||\n";
show_diff(base => \@base, theirs => \@theirs);
print "=======\n";
print @theirs;
@ours = @base = @theirs = ();
}
sub show_diff {
my ($pre_name, $pre_data, $post_name, $post_data) = @_;
my $pre = File::Temp->new;
print $pre @$pre_data;
$pre->flush;
my $post = File::Temp->new;
print $post @$post_data;
$post->flush;
open(my $diff, '-|', qw(diff -u), $pre->filename, $post->filename);
# throw away file header, which just mentions tempfiles, and replace
# it with our own
<$diff>; <$diff>;
print "--- $pre_name\n";
print "+++ $post_name\n";
while (<$diff>) {
print;
}
}
sub state_none {
if (/^<{7}/) { $state = \&state_ours }
print
}
sub state_ours {
if (/^\|{7}/) { $state = \&state_base }
else { push @ours, $_ }
}
sub state_base {
if (/^={7}/) { $state = \&state_theirs }
else { push @base, $_ }
}
sub state_theirs {
if (/^>{7}/) { flush(); print; $state = \&state_none }
else { push @theirs, $_ }
}
$state = \&state_none;
while (<>) {
$state->();
}
next prev parent reply other threads:[~2020-07-23 18:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 23:29 Improving merge of tricky conflicts B. Stebler
2020-07-22 5:50 ` Johannes Sixt
2020-07-22 7:45 ` Jeff King
2020-07-22 17:26 ` Junio C Hamano
2020-07-23 18:25 ` Jeff King [this message]
2020-07-24 1:19 ` Junio C Hamano
2020-07-24 19:48 ` Jeff King
2020-07-24 20:18 ` Junio C Hamano
2021-01-16 2:50 ` Martin von Zweigbergk
2021-01-21 14:28 ` Jeff King
2021-01-21 20:30 ` Martin von Zweigbergk
2021-01-21 21:08 ` Jeff King
2020-07-22 20:17 ` Sergey Organov
2020-07-22 21:14 ` Junio C Hamano
2020-07-22 21:20 ` Sergey Organov
2020-07-23 18:26 ` Jeff King
2020-07-23 19:11 ` Sergey Organov
2020-07-23 21:39 ` Junio C Hamano
2020-07-24 5:15 ` Jacob Keller
2020-07-24 6:01 ` Junio C Hamano
2020-07-24 6:53 ` Sergey Organov
2020-07-24 20:30 ` Junio C Hamano
2020-07-24 22:11 ` Sergey Organov
2020-07-24 23:04 ` Junio C Hamano
2020-07-22 22:48 ` Bono Stebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723182549.GB3975154@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=bono.stebler@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).