[PATCH v3 0/4] customizable --color-words
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Jan 11, 2009, 10:27 UTC
- Message-ID
- <cover.1231669012.git.trast@student.ethz.ch>
- 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 ;-)
Show 6 quoted lines
> 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