On Wed, 15 Feb 2006, Garrett Rooney wrote:
> On 2/15/06, Peter N. Lundblad <peter@famlundblad.se> wrote:
> > Hi,
> >
> > I've been spending some time in libsvn_diff/diff_file.c implementing
> > options to ignore whitespace, eol-style and the -p option of GNU diff
> > (--show-c-function).
> >
> > The patch is nearly complete. Some cleanups are remaining and I'll write
> > some tests. I've tested it with very small chunk sizes to shake out most
> > bugs (I hope), but since this gets rather hairy (at least for me), some
> > more eyes would really be appreciated. Oh, and ofcourse, the patch was
> > produced using the -p option:-)
>
> One comment, this seems to add -b, -w, and -p options, we might also
> want to accept the -u option (unified), and just ignore it since
> that's our default. This would let people who use GNU diff as their
> --diff-cmd continue to use the same kind of -x options, for example I
> currently use --diff-cmd diff -x-up to generate patches for review.
>
> Of course, now I see in the actual code we do have the 'u' option in
> the diff_options structure. This should probably be mentioned in the
> log ;-)
>
We always supported -u, look in the client part of the patch. ;)
> Another thing is that perhaps in 2.0 we should be using names like
> svn_diff_file_output_unified_three instead of
> svn_diff_file_output_unified3, so we don't end up with this strange _2
> suffixes.
>
Yeah, these are nasty, but I think this special-case is acceptable. We
could use 3way# instead of "3" in the name for svn_diff_diff3, but since
we already have a clash, I didn't bother. We will probably have to go over
all function names (at least revised ones) for 2.0...
Thanks for reviewing,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 16 10:04:59 2006