From: Thomas Rast <trast@student.ethz.ch>
To: git@vger.kernel.org
Cc: Junio C Hamano <junio@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Teemu Likonen <tlikonen@iki.fi>
Subject: [PATCH v3 0/4] customizable --color-words
Date: Sun, 11 Jan 2009 11:27:10 +0100 [thread overview]
Message-ID: <cover.1231669012.git.trast@student.ethz.ch> (raw)
In-Reply-To: <7vr63atykr.fsf@gitster.siamese.dyndns.org>
Johannes Schindelin wrote:
> On Sat, 10 Jan 2009, Thomas Rast wrote:
> > Johannes Schindelin wrote:
> > > So I still find your patch way too large
The bad news is... it just got bigger ;-)
> In your case, I imagine it would be much easier to get reviewers if you
> had
>
> patch 1/4 refactor color-words to allow for 0-character word
> boundaries
> patch 2/4 allow regular expressions to define what makes a word
So here's a 4-patch series. I put the first split in a different
place than you suggested, however. I couldn't see a good way to
separate empty boundaries from regex splitting in such a way that the
first half can be exercised (is not just dead code). 1/4 basically
just rearranges code a bit and should be a real no-op patch.
Junio C Hamano wrote:
> diff.c: In function 'scan_word_boundaries':
> diff.c:512: warning: enumeration value 'DIFF_WORD_UNDEF' not handled in sw
Thanks, added a case to test for this.
There is one other minor semantic change in 2/4: the error reporting
in case your regex matched "foo\nbar" now says "before 'bar'" instead
of "near '\nbar'". Other than that, there are only a bunch of added
comments when comparing the result of all four patches with v2.
Thomas Rast (4):
word diff: comments, preparations for regex customization
word diff: customizable word splits
word diff: make regex configurable via attributes
word diff: test customizable word splits
Documentation/diff-options.txt | 18 +++-
Documentation/gitattributes.txt | 21 +++
diff.c | 282 ++++++++++++++++++++++++++++++++++++---
diff.h | 1 +
t/t4033-diff-color-words.sh | 90 +++++++++++++
userdiff.c | 27 +++-
userdiff.h | 1 +
7 files changed, 413 insertions(+), 27 deletions(-)
create mode 100755 t/t4033-diff-color-words.sh
next prev parent reply other threads:[~2009-01-11 10:28 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-09 0:05 [RFC PATCH] make diff --color-words customizable Thomas Rast
2009-01-09 0:25 ` Johannes Schindelin
2009-01-09 0:50 ` Thomas Rast
2009-01-09 11:15 ` Johannes Schindelin
2009-01-09 11:59 ` [ILLUSTRATION PATCH] color-words: take an optional regular expression describing words Johannes Schindelin
2009-01-09 12:24 ` Thomas Rast
2009-01-09 13:05 ` Teemu Likonen
2009-01-10 0:57 ` [PATCH v2] make diff --color-words customizable Thomas Rast
2009-01-10 1:50 ` Jakub Narebski
2009-01-10 11:37 ` Johannes Schindelin
2009-01-10 13:36 ` Jakub Narebski
2009-01-10 14:08 ` Johannes Schindelin
2009-01-12 23:59 ` Jakub Narebski
2009-01-13 0:40 ` Johannes Schindelin
2009-01-10 17:53 ` Davide Libenzi
2009-01-13 0:52 ` Jakub Narebski
2009-01-13 18:50 ` Davide Libenzi
2009-01-10 10:49 ` Johannes Schindelin
2009-01-10 11:25 ` Thomas Rast
2009-01-10 11:45 ` Johannes Schindelin
2009-01-11 1:34 ` Junio C Hamano
2009-01-11 10:27 ` Thomas Rast [this message]
2009-01-11 10:27 ` [PATCH v3 1/4] word diff: comments, preparations for regex customization Thomas Rast
2009-01-11 13:41 ` Johannes Schindelin
2009-01-11 19:49 ` Johannes Schindelin
2009-01-11 22:19 ` Junio C Hamano
2009-01-11 10:27 ` [PATCH v3 2/4] word diff: customizable word splits Thomas Rast
2009-01-11 22:20 ` Junio C Hamano
2009-01-11 10:27 ` [PATCH v3 3/4] word diff: make regex configurable via attributes Thomas Rast
2009-01-11 23:20 ` Junio C Hamano
2009-01-11 10:27 ` [PATCH v3 4/4] word diff: test customizable word splits Thomas Rast
2009-01-09 9:53 ` [RFC PATCH] make diff --color-words customizable Jeff King
2009-01-09 11:18 ` Johannes Schindelin
2009-01-09 11:22 ` 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=cover.1231669012.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=junio@pobox.com \
--cc=tlikonen@iki.fi \
/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).