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

Re: diff --summarize [was: svn commit: r1159880 ...]

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Mon, 22 Aug 2011 12:42:55 +0100

I (Julian Foad) wrote:
> On Sun, 2011-08-21, Neels J Hofmeyr wrote:
> > Julian!
> >
> > Great stuff! :D
> >
> > Well, I haven't looked at the patch in great detail, but the summary reads
> > like honey and cream. Ever since I waded through the diff code years ago
> > this task has been on my, er, long-term to-do list... Thanks! :)
> >
> > Oh but it's not done yet, of course. The "Later we can drive...", does that
> > mean you'll continue to work on it in the coming weeks? Or are you off to
> > other tasks and it's going to be *a lot* later if it depended on you?
>
> I've got a working patch for enabling WC-WC diff summaries, so I'll
> finish that very soon,

r1160204.

> and I'll probably do WC-repos as well, since I
> don't think that can be much more work.

But not yet. Feel free to jump in there.

I'm noticing all sorts of nasty inconsistencies in diffs. For instance,
manual testing reveals that in svn_client_diff5(), show_copies_as_adds
is ignored for a repos-repos diff. Instead, a file is diffed against its
copyfrom source iff the file is the diff target and not if some parent
directory is the diff target. For a repos-WC diff, this is ignored if
the file is the diff target. Ugh. Later.

- Julian

> > On 08/20/2011 03:56 PM, julianfoad_at_apache.org wrote:
> > > Author: julianfoad
> > > Date: Sat Aug 20 13:56:52 2011
> > > New Revision: 1159880
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1159880&view=rev
> > > Log:
> > > Change the implementation of 'svn diff --summarize' to use the standard
> > > 'diff callbacks' mechanism, so that it may be more easily extended. The
> > > summary mode currently supports only repos-repos diffs, and it was reporting
> > > the summary results directly from a delta editor drive. Instead, write a
> > > set of diff callbacks that produce summary information, and drive them via
> > > the existing svn_client__get_diff_editor() for a repos-repos diff. Later we
> > > can drive the same diff callbacks from WC-WC and WC-repos diff sources.
> > ...
>
>
Received on 2011-08-22 13:44:03 CEST

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