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

Re: `svn diff' progress

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2001-12-19 00:21:47 CET

Greg Stein <gstein@lyra.org> writes:

> How about a third:
>
> * ask the server for differences between rev1 and rev2
> * for each change, display that change
>
> I'm not sure that we need working copies at all for this situation.
>
> The query for the delta between rev1 and rev2 already occurs in a more
> complex form for "svn update". We just dumb it down, add a new RA entry
> point, and away we go.
>
> We probably want to display a diff according to user prefs, which means that
> we need both fulltexts on the client. Given that a WC might not even exist
> (e.g. why should "svn diff -r 1 -r 2 http://svn.collab.net/repos/trunk"
> require a WC?),

Agreed.

> then we need to fetch a complete file for rev1 and then an
> svndiff for rev1->rev2, build a fulltext of rev2, then feed that to the
> user's diff.

We can't sensibly fetch the complete rev1 of a given file until we
know that the file occurs in the rev1-to-rev2 diff. So perhaps we
could request the rev1-to-rev2 diff, parse it to drive the editor, and
then as files appear in the diff request the complete rev1 for the
affected components.

Is it possible to run a second repository request and editor while in
the middle of parsing a first request? Is there any chance of one
request blocking the other leading to deadlock?

>
> Note that a lot of this fetching behavior is also required by the merge
> functionality. We should have a lot of the functionality now or RSN.

Given that I copied most of the diff code from update, copying from
the merge code is definitely the way to go!

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:53 2006

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