From: Jeff King <peff@peff.net>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 4/5] add--interactive: allow negatation of hunk filters
Date: Wed, 27 Jul 2011 02:05:56 -0600 [thread overview]
Message-ID: <20110727080556.GD14002@sigill.intra.peff.net> (raw)
In-Reply-To: <20110727080303.GA8105@sigill.intra.peff.net>
This patch lets you filter out certain boring hunks, rather
than trying to match particular interesting ones (which may
be much easier, depending on your file contents).
Signed-off-by: Jeff King <peff@peff.net>
---
git-add--interactive.perl | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index bb16f71..917b2a9 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -87,6 +87,7 @@ sub colored {
my $patch_mode;
my $patch_mode_revision;
my @patch_mode_hunk_filter;
+my $patch_mode_negate_filter;
sub apply_patch;
sub apply_patch_for_checkout_commit;
@@ -1279,9 +1280,9 @@ sub want_hunk {
my $text = join('', @{$hunk->{TEXT}});
foreach my $re (@patch_mode_hunk_filter) {
- return 1 if $text =~ $re;
+ return !$patch_mode_negate_filter if $text =~ $re;
}
- return 0;
+ return $patch_mode_negate_filter;
}
sub patch_update_file {
@@ -1590,6 +1591,9 @@ sub process_args {
or die "malformed hunk filter $1: " . trim_error($@);
push @patch_mode_hunk_filter, $re;
}
+ elsif ($ARGV[0] eq '--negate-hunk-filter') {
+ $patch_mode_negate_filter = 1;
+ }
else {
last;
}
--
1.7.5.4.31.ge4d5e
next prev parent reply other threads:[~2011-07-27 8:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-24 5:11 feature request: git add--interactive --patch on regex-matched hunks only Nguyen Thai Ngoc Duy
2011-07-25 21:55 ` Jeff King
2011-07-25 23:44 ` Junio C Hamano
2011-07-26 5:03 ` Jeff King
2011-07-26 3:03 ` Nguyen Thai Ngoc Duy
2011-07-26 5:14 ` Jeff King
2011-07-26 5:57 ` Nguyen Thai Ngoc Duy
2011-07-26 6:09 ` Jeff King
2011-07-26 12:44 ` Nguyen Thai Ngoc Duy
2011-07-26 13:03 ` Nguyen Thai Ngoc Duy
2011-07-27 8:10 ` Jeff King
2011-07-27 9:02 ` Nguyen Thai Ngoc Duy
2011-07-27 17:24 ` Jeff King
2011-07-27 8:03 ` Jeff King
2011-07-27 8:05 ` [PATCH 1/5] add--interactive: refactor patch mode argument processing Jeff King
2011-07-27 8:05 ` [PATCH 2/5] add--interactive: factor out regex error handling Jeff King
2011-07-27 8:05 ` [PATCH 3/5] add--interactive: allow hunk filtering on command line Jeff King
2011-07-27 8:05 ` Jeff King [this message]
2011-07-27 8:06 ` [PATCH 5/5] add--interactive: add option to autosplit hunks Jeff King
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=20110727080556.GD14002@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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.
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).