Issue126

Title add -w (ignore whitespace changes) to diff
Priority wish Status resolved
Superseder hg diff -w does not ignore white space in hunks containing other changes
View: 127
Nosy List mat, vadim
Assigned To vadim Topics

Created on 2006-02-15.16:33:03 by mat, last changed 2006-02-21.13:51:40 by ThomasAH.

Messages
msg531 (view) Author: ThomasAH Date: 2006-02-21.13:51:40
closing this one in favour of issue127
msg483 (view) Author: vadim Date: 2006-02-15.18:49:57
On 2/15/06, Chris Mason <mason@suse.com> wrote:

> There are two options for the diff lib in hg 0.8 and higher.  You set them via
> the .hgrc.

i have added command line options too.

> ignorews=True ignores spaces and tabs on a single line.  vertical ws is still
> factored in.

did you add this code? please look at issue 127. it does not work all the time.
msg481 (view) Author: mason Date: 2006-02-15.18:42:31
On Wednesday 15 February 2006 11:33, Mathieu Arnold wrote:
> New submission from Mathieu Arnold <hg@mat.cc>:
>
> It would really be nice if diff had some more options, one ignoring white
> space (horizontal and/or vertical) would be very nice.

There are two options for the diff lib in hg 0.8 and higher.  You set them via 
the .hgrc.  The code also supports setting the number of context lines, but 
apparently I forgot to add .hgrc entries for it.

[diff]
showfunc=True|False # default true
ignorews=True|False # default false

showfunc=True gives you diff -p
ignorews=True ignores spaces and tabs on a single line.  vertical ws is still 
factored in.

-chris
msg480 (view) Author: vadim Date: 2006-02-15.18:38:03
i have a fix in crew repo. please try, but look at issue 127 too so you will not
be surprised if ignoring white space does not always work.
msg478 (view) Author: mat Date: 2006-02-15.16:32:55
It would really be nice if diff had some more options, one ignoring white space
(horizontal and/or vertical) would be very nice.
History
Date User Action Args
2006-02-21 13:51:40ThomasAHsetstatus: testing -> resolved
nosy: vadim, mat
superseder: + hg diff -w does not ignore white space in hunks containing other changes
messages: + msg531
2006-02-15 18:50:00vadimsetnosy: vadim, mat
messages: + msg483
2006-02-15 18:42:34masonsetnosy: vadim, mat
messages: + msg481
2006-02-15 18:38:03vadimsetstatus: unread -> testing
assignedto: vadim
messages: + msg480
nosy: + vadim
2006-02-15 16:33:03matcreate