From: Jonathan Lebon <jonathan.lebon@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net, Jonathan Lebon <jonathan.lebon@gmail.com>
Subject: [PATCH 4/4] diff-highlight: add maxhunksize config option
Date: Mon, 2 Nov 2015 21:05:34 -0500 [thread overview]
Message-ID: <1446516334-27652-5-git-send-email-jonathan.lebon@gmail.com> (raw)
In-Reply-To: <1446516334-27652-1-git-send-email-jonathan.lebon@gmail.com>
As the size of the hunk gets bigger, it becomes harder to jump back and
forth between the removed and added lines, and highlighting becomes less
beneficial. We add a new config option called
diff-highlight.maxhunksize
which controls the maximum size of the hunk allowed for which
highlighting is still performed. The default value is set to 20.
Signed-off-by: Jonathan Lebon <jonathan.lebon@gmail.com>
---
contrib/diff-highlight/README | 20 ++++++++++++++++++++
contrib/diff-highlight/diff-highlight | 16 ++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/contrib/diff-highlight/README b/contrib/diff-highlight/README
index 885ff2f..ed12be1 100644
--- a/contrib/diff-highlight/README
+++ b/contrib/diff-highlight/README
@@ -89,6 +89,26 @@ newHighlight = "black #aaffaa"
---------------------------------------------
+Max Hunk Config
+---------------
+
+By default, diff-highlight will not do any highlighting if either the
+number of removed or added lines is greater than 20. This is because as
+the hunk gets bigger, it becomes harder to jump back and forth between
+the removed and added lines, and highlighting becomes less beneficial.
+
+You can change this default by setting the "diff-highlight.maxhunksize"
+configuration.
+
+Example:
+
+---------------------------------------------
+# Increase the maximum diff-highlight to 30
+[diff-highlight]
+maxhunksize = 30
+---------------------------------------------
+
+
Bugs
----
diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight
index 46556fc..a005146 100755
--- a/contrib/diff-highlight/diff-highlight
+++ b/contrib/diff-highlight/diff-highlight
@@ -17,6 +17,8 @@ my @NEW_HIGHLIGHT = (
color_config('color.diff-highlight.newreset', $OLD_HIGHLIGHT[2])
);
+my $MAX_HUNK_SIZE = config('diff-highlight.maxhunksize', 20);
+
my $RESET = "\x1b[m";
my $COLOR = qr/\x1b\[[0-9;]*m/;
my $BORING = qr/$COLOR|\s/;
@@ -79,6 +81,13 @@ sub color_config {
return length($s) ? $s : $default;
}
+# Also handle our own fallback here to be independent.
+sub config {
+ my ($key, $default) = @_;
+ my $s = `git config --get $key 2>/dev/null`;
+ return length($s) ? $s : $default;
+}
+
sub show_hunk {
my ($a, $b) = @_;
@@ -88,6 +97,13 @@ sub show_hunk {
return;
}
+ # Skip highlighting if the hunk gets bigger than the user configured
+ # limit.
+ if (@$a > $MAX_HUNK_SIZE || @$b > $MAX_HUNK_SIZE) {
+ print @$a, @$b;
+ return;
+ }
+
my @queue;
match_and_highlight_pairs($a, 0, scalar @$a, $b, 0, scalar @$b, \@queue);
print @queue;
--
2.6.0
next prev parent reply other threads:[~2015-11-03 2:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 2:05 [PATCH 0/4] diff-highlight: make a few improvements Jonathan Lebon
2015-11-03 2:05 ` [PATCH 1/4] diff-highlight: add `less -r` to cmd in README Jonathan Lebon
2015-11-03 2:41 ` Junio C Hamano
2015-11-03 3:12 ` Jonathan Lebon
2015-11-03 21:14 ` Jeff King
2015-11-03 21:51 ` Junio C Hamano
2015-11-03 21:55 ` Jeff King
2015-11-03 2:05 ` [PATCH 2/4] diff-highlight: factor out prefix/suffix functions Jonathan Lebon
2015-11-03 21:17 ` Jeff King
2015-11-03 2:05 ` [PATCH 3/4] diff-highlight: match up lines before highlighting Jonathan Lebon
2015-11-03 21:44 ` Jeff King
2015-11-03 22:03 ` Jeff King
2015-11-17 5:18 ` Jonathan Lebon
2015-11-17 22:50 ` Jeff King
2015-11-03 2:05 ` Jonathan Lebon [this message]
2015-11-03 21:46 ` [PATCH 4/4] diff-highlight: add maxhunksize config option Jeff King
2015-11-03 22:07 ` [PATCH 0/4] diff-highlight: make a few improvements 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=1446516334-27652-5-git-send-email-jonathan.lebon@gmail.com \
--to=jonathan.lebon@gmail.com \
--cc=git@vger.kernel.org \
--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.
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).