From: Jonathan Tan <jonathantanmy@google.com>
To: Stefan Beller <sbeller@google.com>
Cc: jacob.keller@gmail.com, simon@ruderich.org, git@vger.kernel.org
Subject: Re: [PATCH 7/7] diff.c: add --color-moved-ignore-space-delta option
Date: Mon, 2 Apr 2018 17:41:18 -0700 [thread overview]
Message-ID: <20180402174118.d204ec0d4b9d2fa7ebd77739@google.com> (raw)
In-Reply-To: <20180402224854.86922-8-sbeller@google.com>
On Mon, 2 Apr 2018 15:48:54 -0700
Stefan Beller <sbeller@google.com> wrote:
> +struct ws_delta {
> + int deltachars;
> + char firstchar;
> +};
I'll just make some overall design comments.
Shouldn't this be a string of characters (or a char* and len) and
whether it was added or removed? If you're only checking the first
character, this would not work if the other characters were different.
> @@ -717,10 +752,20 @@ static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
> const struct diff_options *diffopt = hashmap_cmp_fn_data;
> const struct moved_entry *a = entry;
> const struct moved_entry *b = entry_or_key;
> + unsigned flags = diffopt->color_moved & XDF_WHITESPACE_FLAGS;
> +
> + if (diffopt->color_moved & COLOR_MOVED_DELTA_WHITESPACES)
> + /*
> + * As there is not specific white space config given,
> + * we'd need to check for a new block, so ignore all
> + * white space. The setup of the white space
> + * configuration for the next block is done else where
> + */
> + flags |= XDF_IGNORE_WHITESPACE;
>
> return !xdiff_compare_lines(a->es->line, a->es->len,
> b->es->line, b->es->len,
> - diffopt->color_moved & XDF_WHITESPACE_FLAGS);
> + flags);
> }
I think we should just prohibit combining this with any of the
whitespace ignoring flags except for the space-at-eol one. They seem to
contradict anyway.
> +test_expect_success 'compare whitespace delta across moved blocks' '
> +
> + git reset --hard &&
> + q_to_tab <<-\EOF >text.txt &&
> + QIndented
> + QText
> + Qacross
> + Qfive
> + Qlines
> + QBut!
> + Qthis
> + QQone
> + Qline
> + QQdid
> + Qnot
> + QQadjust
> + EOF
Do we need 5 lines? I thought 2 would suffice. (It's the ALNUM_COUNT
that matters, as far as I know.) This makes it hard to see that the
"But!" line is the one that counts.
> +test_expect_success 'compare whitespace delta across moved blocks with multiple indentation levels' '
> + # alternative: "python programmers would love the move detection, too"
> +
> + git reset --hard &&
> + q_to_tab <<-\EOF >test.py &&
> + class test:
> + Qdef f(x):
> + QQ"""
> + QQA simple python function
> + QQthat returns the square of a number
> + QQAlthough it may not be pythonic
> + QQ"""
> + QQdef g(x):
> + QQQ"""
> + QQQNested function that returns the same number
> + QQQWe just multiply by 1.0
> + QQQso we can write a comment about it
> + QQQas we need longer blocks
> + QQQ"""
> + QQQreturn 1.0 * x
> + QQ# Another comment for f(x)
> + QQ# also spanning multiple lines
> + QQ# to make a block
> + QQreturn g(x) * g(x)
> + Qdef h(x):
> + QQ# Another function unrelated to the previous
> + QQ# but building a block,
> + QQ# long enough to call it a block
> + QQreturn x * 1.0
> + EOF
If the objective it just to show that the functions f and g are treated
as one unit despite their lines being of multiple indentation levels,
the test file could be much shorter.
next prev parent reply other threads:[~2018-04-03 0:41 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-02 22:48 [RFC PATCH 0/7] Moved code detection: ignore space on uniform indentation Stefan Beller
2018-04-02 22:48 ` [PATCH 1/7] xdiff/xdiff.h: remove unused flags Stefan Beller
2018-04-02 22:48 ` [PATCH 2/7] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2018-04-02 22:48 ` [PATCH 3/7] diff.c: do not pass diff options as keydata to hashmap Stefan Beller
2018-04-06 20:04 ` Jeff King
2018-04-06 20:41 ` Stefan Beller
2018-04-02 22:48 ` [PATCH 4/7] diff.c: adjust hash function signature to match hashmap expectation Stefan Beller
2018-04-02 22:48 ` [PATCH 5/7] diff.c: refactor internal representation for coloring moved code Stefan Beller
2018-04-02 23:51 ` Jonathan Tan
2018-04-03 18:59 ` Stefan Beller
2018-04-06 21:28 ` Stefan Beller
2018-04-06 22:27 ` Jonathan Tan
2018-04-03 19:39 ` Ævar Arnfjörð Bjarmason
2018-04-03 19:49 ` Stefan Beller
2018-04-03 20:44 ` Ævar Arnfjörð Bjarmason
2018-04-03 21:05 ` [PATCH] diff: add a blocks mode for moved code detection Stefan Beller
2018-04-02 22:48 ` [PATCH 6/7] diff.c: decouple white space treatment for move detection from generic option Stefan Beller
2018-04-03 0:31 ` Jonathan Tan
2018-04-02 22:48 ` [PATCH 7/7] diff.c: add --color-moved-ignore-space-delta option Stefan Beller
2018-04-03 0:41 ` Jonathan Tan [this message]
2018-04-03 19:22 ` Stefan Beller
2018-04-03 20:38 ` Jonathan Tan
2018-04-02 23:47 ` [RFC PATCH 0/7] Moved code detection: ignore space on uniform indentation Jonathan Tan
2018-04-03 0:03 ` Jacob Keller
2018-04-03 19:00 ` Stefan Beller
2018-04-03 19:55 ` Jacob Keller
-- strict thread matches above, loose matches on Subject: below --
2018-04-24 21:03 [PATCHv2 " Stefan Beller
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
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=20180402174118.d204ec0d4b9d2fa7ebd77739@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=sbeller@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).