From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: Re: [PATCH 5/6] diff.c: omit uninteresting moved lines
Date: Wed, 28 Jun 2017 13:00:09 -0700 [thread overview]
Message-ID: <CAGZ79kYXzMkO0jtAbCS3f57NtXFHqxVtFUVgq=wNC8PDrfa1dA@mail.gmail.com> (raw)
In-Reply-To: <xmqqwp7wyei3.fsf@gitster.mtv.corp.google.com>
On Tue, Jun 27, 2017 at 8:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> It is useful to have moved lines colored, but there are annoying corner
>> cases, such as a single line moved, that is very common. For example
>> in a typical patch of C code, we have closing braces that end statement
>> blocks or functions.
>>
>> While it is technically true that these lines are moved as they show up
>> elsewhere, it is harmful for the review as the reviewers attention is
>> drawn to such a minor side annoyance.
>>
>> One of the first solutions considered, started off by these hypothesis':
>
> Hypotheses is the plural form of that word, I think.
>
>> (a) The more blocks of the same code we have, the less interesting it is.
>> (b) The shorter a block of moved code is the less need of markup there
>> is for review.
>>
>> Introduce a heuristic which drops any potential moved blocks if their
>> length is shorter than the number of potential moved blocks.
>>
>> This heuristic was chosen as it is agnostic of the content (in other
>> languages or contents to manage, we may have longer lines, e.g. in
>> shell the closing of a condition is already 2 characters. Thinking
>> about Latex documents tracked in Git, there can also be some
>> boilerplate code with lots of characters) while taking both
>> hypothesis' into account. An alternative considered was the number
>> of non-whitespace characters in a line for example.
>
> It was puzzling what the above two paragraphs were. I took (a) and
> (b) were the hypotheses, and the two above, and also the next
> paragraphs, were the design that fell out of them. But that is not
> what is happening. You changed your mind and settled on the design
> in the next paragraph.
Yes, I somehow want to say:
"What is implemented in this patch is stupid. And I know it, but I
know no smarter idea. This is what I thought was smarter, maybe
someone in the future can be inspired by this, at least."
> Perhaps we can do without all of the "I thought about this but it
> didn't make sense" that is longer than the solution in the patch?
As I do changes based on your responses, I want to squash
these patches sent out last night into the original patch, so I'll butcher
the commit message to be way smaller
next prev parent reply other threads:[~2017-06-28 20:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 0:56 [PATCH 0/6] Fixing up sb/diff-color-moved Stefan Beller
2017-06-28 0:56 ` [PATCH 1/6] diff.c: factor out shrinking of potential moved line blocks Stefan Beller
2017-06-28 0:56 ` [PATCH 2/6] diff.c: change the default for move coloring to zebra Stefan Beller
2017-06-28 3:14 ` Junio C Hamano
2017-06-28 19:54 ` Stefan Beller
2017-06-28 0:56 ` [PATCH 3/6] diff.c: better reporting on color.moved bogus configuration Stefan Beller
2017-06-28 0:56 ` [PATCH 4/6] Documentation/diff: reword color moved Stefan Beller
2017-06-28 3:25 ` Junio C Hamano
2017-06-28 0:56 ` [PATCH 5/6] diff.c: omit uninteresting moved lines Stefan Beller
2017-06-28 3:31 ` Junio C Hamano
2017-06-28 20:00 ` Stefan Beller [this message]
2017-06-28 0:56 ` [PATCH 6/6] diff.c: detect blocks despite whitespace changes Stefan Beller
2017-06-28 3:41 ` Junio C Hamano
2017-06-28 5:06 ` Junio C Hamano
2017-06-28 20:36 ` Stefan Beller
2017-06-28 21:16 ` Junio C Hamano
2017-06-29 21:01 ` Stefan Beller
2017-06-29 23:51 ` Junio C Hamano
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='CAGZ79kYXzMkO0jtAbCS3f57NtXFHqxVtFUVgq=wNC8PDrfa1dA@mail.gmail.com' \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).