From: "Michał Kępień" <michal@isc.org>
To: git@vger.kernel.org
Subject: [PATCH v4 0/2] diff: add -I<regex> that ignores matching changes
Date: Tue, 20 Oct 2020 08:48:07 +0200 [thread overview]
Message-ID: <20201020064809.14297-1-michal@isc.org> (raw)
In-Reply-To: <20201015072406.4506-1-michal@isc.org>
This patch series adds a new diff option that enables ignoring changes
whose all lines (changed, removed, and added) match a given regular
expression. This is similar to the -I/--ignore-matching-lines option in
standalone diff utilities and can be used e.g. to ignore changes which
only affect code comments or to look for unrelated changes in commits
containing a large number of automatically applied modifications (e.g. a
tree-wide string replacement). The difference between -G/-S and the new
-I option is that the latter filters output on a per-change basis.
Changes from v3:
- Do not release the memory allocated in diff_opt_ignore_regex() after
all as the free() calls added in v2 were triggering use-after-free
errors when the diff machinery was invoked multiple times throughout
the lifetime of a single Git command (e.g. by "git log -p").
- Further test improvements: split various -I<regex> checks into
multiple tests; add a check for "git log -p -I<regex>" to trigger
the issue mentioned above; avoid using --no-index.
Changes from v2:
- Add a long option for -I (--ignore-matching-lines) as it is
commonplace in standalone diff utilities. Update documentation and
commit log messages accordingly.
- Use xmalloc() instead of xcalloc() for allocating regex_t
structures in diff_opt_ignore_regex().
- Ensure the memory allocated in diff_opt_ignore_regex() gets
released.
- Use "return error(...)" instead of die() in the -I option callback.
Make sure the error message is localizable.
- Drastically reduce the number of -I<regex> tests due to excessive
run time of t/t4069-diff-ignore-regex.sh from v1/v2 on some
platforms (notably Windows). Use a tweaked version of a test
suggested by Johannes Schindelin (thanks!). Squash patch 3 into
patch 2.
- Replace "see Documentation/diff-options.txt" with "-I<regex>" in the
comments for the added structure fields, in order to make these
comments more useful.
Changes from v1:
- Add a new preliminary cleanup patch which ensures xpparam_t
structures are always zero-initialized. (This was a prerequisite
for the next change below.)
- Do not add a new 'xdl_opts' flag to check whether -I was used;
instead, just check whether the array of regular expressions to
match against is non-NULL.
- Enable the -I option to be used multiple times. As a consequence of
this, regular expressions are now "pre-compiled" in the option's
callback (and passed around as an array of regex_t structures)
rather than deep down in xdiff code. Add test cases exercising use
of multiple -I options in the same git invocation. Update
documentation accordingly.
- Rename xdl_mark_ignorable() to xdl_mark_ignorable_lines(), to
indicate that it is logically a "sibling" of
xdl_mark_ignorable_regex() rather than its "parent".
- Optimize xdl_mark_ignorable_regex() by making it immediately skip
changes already marked as ignored by xdl_mark_ignorable_lines().
- Fix coding style issue in the prototype part of the definition of
xdl_mark_ignorable_regex().
- Add "/* see Documentation/diff-options.txt */" comments for the
fields added to struct diff_options and xpparam_t, mimicking the
comments used for 'anchors', 'anchors_nr', and 'anchors_alloc'.
- Revise commit log messages to reflect all of the above.
Michał Kępień (2):
merge-base, xdiff: zero out xpparam_t structures
diff: add -I<regex> that ignores matching changes
Documentation/diff-options.txt | 5 ++
builtin/merge-tree.c | 1 +
diff.c | 23 +++++
diff.h | 4 +
t/t4013-diff-various.sh | 41 +++++++++
t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master | 99 ++++++++++++++++++++++
xdiff/xdiff.h | 4 +
xdiff/xdiffi.c | 47 +++++++++-
xdiff/xhistogram.c | 2 +
xdiff/xpatience.c | 2 +
10 files changed, 226 insertions(+), 2 deletions(-)
create mode 100644 t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
--
2.28.0
next prev parent reply other threads:[~2020-10-20 6:48 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 12:06 [PATCH 0/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-01 12:06 ` [PATCH 1/2] " Michał Kępień
2020-10-01 18:21 ` Junio C Hamano
2020-10-07 19:48 ` Michał Kępień
2020-10-07 20:08 ` Junio C Hamano
2020-10-01 12:06 ` [PATCH 2/2] t: add -I<regex> tests Michał Kępień
2020-10-01 17:02 ` [PATCH 0/2] diff: add -I<regex> that ignores matching changes Junio C Hamano
2020-10-12 9:17 ` [PATCH v2 0/3] " Michał Kępień
2020-10-12 9:17 ` [PATCH v2 1/3] merge-base, xdiff: zero out xpparam_t structures Michał Kępień
2020-10-12 11:14 ` Johannes Schindelin
2020-10-12 17:09 ` Junio C Hamano
2020-10-12 19:52 ` Junio C Hamano
2020-10-13 6:35 ` Michał Kępień
2020-10-12 9:17 ` [PATCH v2 2/3] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-12 11:20 ` Johannes Schindelin
2020-10-12 20:00 ` Junio C Hamano
2020-10-12 20:39 ` Johannes Schindelin
2020-10-12 21:43 ` Junio C Hamano
2020-10-13 6:37 ` Michał Kępień
2020-10-13 15:49 ` Junio C Hamano
2020-10-13 6:36 ` Michał Kępień
2020-10-13 12:02 ` Johannes Schindelin
2020-10-13 15:53 ` Junio C Hamano
2020-10-13 18:45 ` Michał Kępień
2020-10-12 18:01 ` Junio C Hamano
2020-10-13 6:38 ` Michał Kępień
2020-10-12 20:04 ` Junio C Hamano
2020-10-13 6:38 ` Michał Kępień
2020-10-12 9:17 ` [PATCH v2 3/3] t: add -I<regex> tests Michał Kępień
2020-10-12 11:49 ` Johannes Schindelin
2020-10-13 6:38 ` Michał Kępień
2020-10-13 12:00 ` Johannes Schindelin
2020-10-13 16:00 ` Junio C Hamano
2020-10-13 19:01 ` Michał Kępień
2020-10-15 11:45 ` Johannes Schindelin
2020-10-15 7:24 ` [PATCH v3 0/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-15 7:24 ` [PATCH v3 1/2] merge-base, xdiff: zero out xpparam_t structures Michał Kępień
2020-10-15 7:24 ` [PATCH v3 2/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2020-10-16 15:32 ` Phillip Wood
2020-10-16 18:04 ` Junio C Hamano
2020-10-19 9:48 ` Michał Kępień
2020-10-16 18:16 ` Junio C Hamano
2020-10-19 9:55 ` Michał Kępień
2020-10-19 17:29 ` Junio C Hamano
2020-10-16 10:00 ` [PATCH v3 0/2] " Johannes Schindelin
2020-10-20 6:48 ` Michał Kępień [this message]
2020-10-20 6:48 ` [PATCH v4 1/2] merge-base, xdiff: zero out xpparam_t structures Michał Kępień
2020-10-20 6:48 ` [PATCH v4 2/2] diff: add -I<regex> that ignores matching changes Michał Kępień
2021-02-05 14:13 ` [PATCH 1/2] diff: add an API for deferred freeing Ævar Arnfjörð Bjarmason
2021-02-10 16:00 ` Johannes Schindelin
2021-02-11 3:00 ` Ævar Arnfjörð Bjarmason
2021-02-11 9:40 ` Johannes Schindelin
2021-02-11 10:21 ` Jeff King
2021-02-11 10:45 ` [PATCH v2 0/2] " Ævar Arnfjörð Bjarmason
2021-02-11 10:45 ` [PATCH v2 1/2] " Ævar Arnfjörð Bjarmason
2021-02-11 10:45 ` [PATCH v2 2/2] diff: plug memory leak from regcomp() on {log,diff} -I Ævar Arnfjörð Bjarmason
2021-02-05 14:13 ` [PATCH " Ævar Arnfjörð Bjarmason
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=20201020064809.14297-1-michal@isc.org \
--to=michal@isc.org \
--cc=git@vger.kernel.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.
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).