From: Stefan Beller <sbeller@google.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git <git@vger.kernel.org>, "Simon Ruderich" <simon@ruderich.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jacob Keller" <jacob.keller@gmail.com>
Subject: Re: [PATCH 6/7] diff.c: decouple white space treatment from move detection algorithm
Date: Tue, 24 Apr 2018 15:19:07 -0700 [thread overview]
Message-ID: <CAGZ79kYPd4KF7H8CiaztouF513gw=nwRuqwGDDKjvBk362e9uw@mail.gmail.com> (raw)
In-Reply-To: <20180424150036.8e7ca862525bedb91673ae46@google.com>
Hi Jonathan,
On Tue, Apr 24, 2018 at 3:00 PM, Jonathan Tan <jonathantanmy@google.com> wrote:
> On Tue, 24 Apr 2018 14:03:29 -0700
> Stefan Beller <sbeller@google.com> wrote:
>
>> As we change the default, we'll adjust the tests.
>
> This statement is probably better written as:
>
> In some existing tests, options like --ignore-space-at-eol were used
> to control the color of the output. They have been updated to use
> options like --color-moved-ignore-space-at-eol instead.
I'll adjust that statement; thanks for helping me out with good commit
messages (even the "As we change the defaults, .." was proposed by
you in a previous round)
>
>> + unsigned flags = diffopt->color_moved_ws_handling
>> + & XDF_WHITESPACE_FLAGS;
>
> No need for "& XDF_WHITESPACE_FLAGS".
This is in anticipation of the next commit, when
color_moved_ws_handling takes more flags.
I can move that over to the last commit.
>
>> + unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
>
> Same here.
Maybe I'll just state in the commit message why we keep the masking
here.
>
>> @@ -214,6 +214,7 @@ struct diff_options {
>> } color_moved;
>> #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
>> #define COLOR_MOVED_MIN_ALNUM_COUNT 20
>> + int color_moved_ws_handling;
>> };
>
> Should the "int" be "unsigned"?
yes.
> I noticed that the flag-like xdl_opts is
> signed, but I think it's better for flags to be unsigned.
I can change those, too.
> Also, document
> what this stores.
ok, will document.
> (And also, I would limit the bits.)
Not sure I follow. you want to make it e.g.
unsigned color_moved_ws_handling : 6;
?
Oh, that would actually work, as XDF_WHITESPACE_FLAGS
are in second to fifth bits.
But then we need to document why the XDF_WHITESPACE
need to be at these low positions.
>> + q_to_tab <<-\EOF >text.txt &&
>> + Qa long line to exceed per-line minimum
>> + Qanother long line to exceed per-line minimum
>> + new file
>
> I know I suggested "per-line minimum", but I don't think there is one -
> I think we only have a per-block minimum. Maybe delete "per-line" in
> each of the lines.
yeah, I guess this heuristic could also make for another setting, though
as of now I did not desire any other heuristic than you originally came up
with. Will reword the text. Thanks!
Thanks,
Stefan
next prev parent reply other threads:[~2018-04-24 22:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 21:03 [PATCHv2 0/7] Moved code detection: ignore space on uniform indentation Stefan Beller
2018-04-24 21:03 ` [PATCH 1/7] xdiff/xdiff.h: remove unused flags Stefan Beller
2018-04-24 21:03 ` [PATCH 2/7] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2018-04-24 21:03 ` [PATCH 3/7] diff.c: do not pass diff options as keydata to hashmap Stefan Beller
2018-04-24 21:03 ` [PATCH 4/7] diff.c: adjust hash function signature to match hashmap expectation Stefan Beller
2018-04-24 21:03 ` [PATCH 5/7] diff.c: add a blocks mode for moved code detection Stefan Beller
2018-04-24 21:50 ` Jonathan Tan
2018-04-24 22:37 ` Stefan Beller
2018-04-24 22:59 ` Jonathan Tan
2018-04-24 21:03 ` [PATCH 6/7] diff.c: decouple white space treatment from move detection algorithm Stefan Beller
2018-04-24 22:00 ` Jonathan Tan
2018-04-24 22:19 ` Stefan Beller [this message]
2018-04-24 21:03 ` [PATCH 7/7] diff.c: add --color-moved-ignore-space-delta option Stefan Beller
2018-04-24 22:35 ` Jonathan Tan
[not found] ` <CAGZ79kbGkHFSS9K8KKTwNikx3Tw+m+RMLY3RAf8SW_iK9a2OJQ@mail.gmail.com>
2018-04-24 23:23 ` Stefan Beller
2018-04-25 0:11 ` Jonathan Tan
2018-04-24 22:37 ` [PATCHv2 0/7] Moved code detection: ignore space on uniform indentation Jonathan Tan
2018-04-24 22:58 ` Stefan Beller
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='CAGZ79kYPd4KF7H8CiaztouF513gw=nwRuqwGDDKjvBk362e9uw@mail.gmail.com' \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=jonathantanmy@google.com \
--cc=simon@ruderich.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).