From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>,
Jeff King <peff@peff.net>, Jens Lehmann <Jens.Lehmann@web.de>,
Davide Libenzi <davidel@xmailserver.org>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [RFC PATCH, WAS: "weird diff output?" 0/2] implement better chunk heuristics
Date: Fri, 15 Apr 2016 10:27:31 -0700 [thread overview]
Message-ID: <xmqq1t66dbp8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGZ79kZs33sJj+DPSS4FPoJTLqbCLpvSe_h9UUQM-dBe=8ExKw@mail.gmail.com> (Stefan Beller's message of "Fri, 15 Apr 2016 10:10:31 -0700")
Stefan Beller <sbeller@google.com> writes:
> Actually we would only need to have the empty line count in the
> second loop as the first loop shifted it as much up(backwards) as
> possible, such that the hunk sits on one end of the movable
> range. The second loop would iterate over the whole range, so that
> would be the only place needed to count.
The description makes me wonder if we can do without two loops ;-)
That is, can we teach the first loop not to be so aggressive to
shift "as much as possible" but notice there is an empty line we
would want to treat specially?
next prev parent reply other threads:[~2016-04-15 17:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 16:51 [RFC PATCH, WAS: "weird diff output?" 0/2] implement better chunk heuristics Jacob Keller
2016-04-15 16:51 ` [RFC PATCH, WAS: "weird diff output?" 1/2] xdiff: add xdl_hash_and_recmatch helper function Jacob Keller
2016-04-15 17:25 ` Junio C Hamano
2016-04-15 19:09 ` Jacob Keller
2016-04-15 16:51 ` [RFC PATCH, WAS: "weird diff output?" 2/2] xdiff: implement empty line chunk heuristic Jacob Keller
2016-04-15 19:57 ` Stefan Beller
2016-04-15 20:06 ` Junio C Hamano
2016-04-15 20:17 ` Jacob Keller
2016-04-15 20:30 ` Junio C Hamano
2016-04-15 21:15 ` Jacob Keller
2016-04-15 21:22 ` Jacob Keller
2016-04-15 21:44 ` Junio C Hamano
2016-04-15 21:56 ` Jacob Keller
2016-04-15 20:06 ` Jacob Keller
2016-04-15 17:02 ` [RFC PATCH, WAS: "weird diff output?" 0/2] implement better chunk heuristics Stefan Beller
2016-04-15 17:10 ` Stefan Beller
2016-04-15 17:27 ` Junio C Hamano [this message]
2016-04-15 17:33 ` Stefan Beller
2016-04-15 17:48 ` Junio C Hamano
2016-04-15 19:09 ` Jacob Keller
2016-04-15 19:08 ` Jacob Keller
2016-04-15 19:07 ` Jacob Keller
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=xmqq1t66dbp8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=davidel@xmailserver.org \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--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.
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).