[PATCH] add color diff support to record extension

Giorgos Keramidas keramida at ceid.upatras.gr
Fri Aug 14 18:58:15 CDT 2009


On Thu, 13 Aug 2009 20:29:26 -0400, Brodie Rao <dackze at gmail.com> wrote:
>On Aug 13, 2009, at 7:44 PM, Giorgos Keramidas wrote:
>> As long as there *is* an option to turn coloring off, --no-color can
>> go.
>
> --color=never does that. --no-color predates the --color option, and it
> was kept around for compatibility reasons. It'd be nice if it were
> marked deprecated and didn't appear in help text by default.

That's nice :)

>> One of the buglets I have discovered about the color extension is
>> that it messes up TAB/SPC combinations in the colorized diff output,
>> so I often turn it off to see the "actual patch text".
>
> Could you elaborate on this? I don't deal with diffs that have mixed
> tabs and spaces often, but I'm not able to duplicate the issue myself:
>
> diff --git a/foo b/foo
> --- a/foo
> +++ b/foo
> @@ -1,2 +1,4 @@
>  <tab><spc><spc>foo
>  <spc><spc><tab>bar
> +<tab><spc><spc>foo
> +<spc><spc><tab>bar

I haven't been able to reproduce this with a recent crew build.  It may
be a false alarm, my apologies.  I remember that it used to do something
funny with mixed TAB and SPC characters and I disabled it in my ~/.hgrc
back in March 2009:

% keramida at kobe:/home/keramida$ hg log -v -r d94746159432
% changeset:   474:d94746159432
% user:        Giorgos Keramidas <keramida at ceid.upatras.gr>
% date:        Sat Mar 14 12:57:53 2009 +0200
% files:       .hgrc
% description:
% hg: disable the color extension
%
% The color extension does something strange with whitespace in the
% patchfile before displaying it.  I like seeing TAB vs. SPC changes,
% instead of hiding them, so disable the extension until I find out
% how to fix it.

But it looks much better now.  I think I'll try using it for a few weeks
and see if I can reproduce this again.  If not, then so much the better,
as I like the colorized output a lot :-)



More information about the Mercurial-devel mailing list