[PATCH 1 of 1 default] hgweb: column / side-by-side diff functionality

Wujek Srujek wujek.srujek at googlemail.com
Mon Jun 4 13:47:16 CDT 2012


Here a link at imgur:
http://imgur.com/a/nY7Vq

Regards,
wujek

On Mon, Jun 4, 2012 at 8:45 PM, Wujek Srujek <wujek.srujek at googlemail.com>wrote:

> Hi. I attach 4 screens (packed):
>
> * coldiff1 - shows a contrived example where you see all the colors; you
> can see 3 blocks of changes separated with horizontal lines (note the line
> numbers, they are not in sequence as not all lines are shown - only the
> relevant changes plus 3 lines of context; I added 7 equal lines to show the
> blocks)
> * coldiff2 - the same file, this time full output is used (see the address
> bar); no blocks, just whole file (as mentioned in the commit message, big
> files with few changed lines are going to output a lot of data)
> * coldiff3 - an actual change in this patch done to the style-paper.css
> file - the new classes added at the end of the file (note not the whole
> file is output, just the relevant lines plus context at the top)
> * coldiff4 - also an actual change from this patch: webutil.py, the
> imports and part of the new function that does the job (again, blocks +
> context used)
>
> The line numbers are actual hrefs with ids, so that links to specific
> lines can be sent over to others.
>
> Regards,
> wujek
>
>
> On Mon, Jun 4, 2012 at 7:12 PM, Bryan O'Sullivan <bos at serpentine.com>wrote:
>
>> On Sun, Jun 3, 2012 at 2:43 PM, wujek srujek <wujek.srujek at googlemail.com
>> > wrote:
>>
>>> Adds new web command to the core, ``filecoldiff`` (and an alias,
>>> ``coldiff``),
>>> which enables colorful side-by-side diff, which for some might be much
>>> easier to
>>> work with than the standard line diff output. The idea how to implement
>>> comes
>>> from the SonicHq extension.
>>>
>>
>> Interesting idea.
>>
>> Could you post a screenshot imgur or someplace, so we can see what it
>> looks like without applying the patch?
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120604/0177237c/attachment.html>


More information about the Mercurial-devel mailing list