[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Experimental svn diff -w

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-02-05 13:25:07 CET

On Fri, 3 Feb 2006, Sander Striker wrote:

> Peter N. Lundblad wrote:
> > Hi,
> >
> > Let me first make it clear that this is just for experimentation. This
> > patch is very incomplete, untested and probably buggy.
>
> Great disclaimer ;).
>
Having seen other toy patches been put down as if they were intended for
commit, I thought that was safest:-)

> > I've implemented a line normalization function, which currently just drops
> > all space characters.
>
> Ah, yes, that's one way to do it, and cheaper than the other way: providing a
> different token compare function.
>
I reallized that the output routines don't make use of the chunks read by
the token reading functions, so I'll normalize once when reading the
chunks.

> > To me, blame seems to work as expected: whitespace-only changes are
> > "transparent". Also, merge seems to do what I want (afdter the
> > abovementioned tweak).
> >
> > The Plan
> > --------
> >
> > If people like this, I plan to use the -x option for diff/diff3 options,
> > as we do for external diffs and allow GNU diff options, e.g.:
> > svn diff -x '-w'
>
> I wonder if we want options to our own code to be passed with -x.
> I can see it for eXternal commands.
>
I'm not entirely comfortable with -x/--extensions being used as if our own
diff library was some external applications. My concern is, besides
rooneg's good point about being able to use the GNU diff option names,
that we may bloat our own "option space", especially if we want more diff
options later.

> > --strip-trailing-cr (maybe)
>
> Hmm, in that case I would say go for --ignore-eol-style.
>
I'm wondering what exactly the semantics would be. Treat all line endings
as the platform line endings, or treat all line endings as LF?

> > I would also like to do -p --show-c-function.
>
> I guess you only need to modify the output functions to implement
> this.
>
Yeah.

//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 5 13:25:35 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.