From: Jeff King <peff@peff.net>
To: Davide Libenzi <davidel@xmailserver.org>
Cc: Stefan Beller <sbeller@google.com>,
Jacob Keller <jacob.keller@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Git mailing list <git@vger.kernel.org>,
Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: weird diff output?
Date: Thu, 14 Apr 2016 14:34:06 -0400 [thread overview]
Message-ID: <20160414183405.GE22068@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.DEB.2.10.1604140639230.8340@zino>
On Thu, Apr 14, 2016 at 06:56:39AM -0700, Davide Libenzi wrote:
> That was a zillions of years ago :) , but from a quick look at email
> thread, if you want to do it within xdiff, xdi_change_compact would be
> the place. The issue is knowing in which situations one diff look
> better than another, and embedding an if-tis-do-tat logic deep into
> the core diff machinery. In theory one could implement the same thing
> higher up, working with the unified diff text format, where maybe a
> user can provide its own diff post-process hook script. In any case,
> that still leaves open the issue on what to shift in the diff chunks,
> and in which cases. Which is likely going to be language/format
> dependent. IMHO, it gets nasty pretty quickly.
Thanks, that's helpful. Stefan already came up with a heuristic that I
implemented as a post-processing script in perl. It _seems_ to work
pretty well in practice across multiple languages, so our next step was
to implement it in an actual usable and efficient way. :)
Looking over the code, I agree that xdl_change_compact() is the place we
would want to put it. We'd probably tie it to a command-line option and
let people play around with it, and then consider making it the default
if there's widespread approval.
-Peff
next prev parent reply other threads:[~2016-04-14 18:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 0:26 weird diff output? Jacob Keller
2016-03-29 17:37 ` Stefan Beller
2016-03-29 17:54 ` Junio C Hamano
2016-03-29 18:16 ` Stefan Beller
2016-03-29 23:05 ` Jacob Keller
2016-03-30 0:04 ` Junio C Hamano
2016-03-30 4:55 ` Jeff King
2016-03-30 6:05 ` Stefan Beller
2016-03-30 6:05 ` Jacob Keller
2016-03-30 19:14 ` Jacob Keller
2016-03-30 19:31 ` Jacob Keller
2016-03-30 19:40 ` Stefan Beller
2016-04-01 19:04 ` Junio C Hamano
2016-03-31 13:47 ` Jeff King
2016-04-06 17:47 ` Jacob Keller
2016-04-12 19:34 ` Stefan Beller
2016-04-14 13:56 ` Davide Libenzi
2016-04-14 18:34 ` Jeff King [this message]
2016-04-14 21:05 ` Stefan Beller
2016-04-15 0:07 ` [RFC PATCH, WAS: "weird diff output?"] Implement better chunk heuristics Stefan Beller
2016-04-15 0:26 ` Jacob Keller
2016-04-15 0:43 ` Stefan Beller
2016-04-15 2:07 ` Jacob Keller
2016-04-15 2:09 ` Junio C Hamano
2016-04-15 3:33 ` Stefan Beller
2016-04-15 0:21 ` weird diff output? Jacob Keller
2016-04-15 2:18 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160414183405.GE22068@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Jens.Lehmann@web.de \
--cc=davidel@xmailserver.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=sbeller@google.com \
/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.
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 NNTP newsgroup(s).