[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: Neels J Hofmeyr <neels_at_elego.de>
Date: Mon, 22 Aug 2011 15:05:31 +0200

On 08/22/2011 02:21 PM, Julian Foad wrote:
> Hi Neels.
>
> The new diff --summarize code presently still downloads the full text of
> each deleted file to supply to the diff callbacks. I have a patch in
> progress (attached) to eliminate this, but I shan't be working on it for
> a few days. With this patch, 'diff --summarize' still works but I
> haven't checked carefully (either by testing or analysis) that this is
> actually eliminating all the unnecessary downloads, and it could do with
> some documentation updates in the diff callbacks to say that this usage
> is allowed.
>
> Feel free to progress this if you wish, otherwise I'll get back to it
> later.

The things you write bring back memories. I too was finding inconsistencies
and cul-de-sacs in the separate diff paths, tried to analyze and found the
confusing, duplicating code paths there. Ever since, I was aware that the
diff cleanup is One Of The Great Things That Have To Be Done One Day. But I
kept pushing it down the to-do list. Right now I'm hacking on my new pet,
the svn:hold feature, so I might be tempted to push diff down the to-do list
some more...

OTOH, just yesterday I bumped the diff API to add an svn:hold related
parameter (on the 'hold' branch) and was confronted with diff code paths
again. So yeah, you'll be the first to know when I have contributions.

The map of diff code paths is still not entirely clear in my head (I still
grep and backtrace a lot for analysis). Some ASCII art could be quite
useful, also to see what parts of it affect 'merge'.

~Neels

Received on 2011-08-22 15:06:10 CEST

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