VCS Interfaces, round 3

Andreas Pakulat apaku at gmx.de
Fri May 4 19:40:47 UTC 2007


On 04.05.07 14:18:40, Matthew Woehlke wrote:
> Andreas Pakulat wrote:
> > On 04.05.07 11:03:24, Matthew Woehlke wrote:
> >> dukju ahn wrote:
> >>> For example, the caller want to invoke
> >>> virtual VcsJob diff( const QVariant& localOrRepoLocationSrc,
> >>>                         const QVariant& localOrRepoLocationDst,
> >>>                         const Revision& srcRevision,
> >>>                         const Revision& dstRevision,
> >>>                         VcsDiffMode ) = 0;
> >>>
> >>> then how the reposLocation Dst can be retrieved? If the qvariant
> >>> is QString("/home/kdev/blah.c"), does it mean to fetch remote diff of given
> >>> local file??
> >> perforce sure seems to think that's valid. Hmm, ok, so that means giving 
> >> a version other than WORKING (or for svn, BASE) means you want to diff 
> >> against repositoryLocation(<file>) rather than <file> (assuming <file> 
> >> is a local file). Makes sense to me... objections?
> > 
> > I don't think I follow here. [snip]
> 
> Nope. Everything I snipped makes sense. What I was saying is if I ask to 
> diff KUrl("/home/user/src/foo/bar.c") as of the revision at 2007/05/02, 
> that implicitly means I'm asking to diff against the repo copy (i.e. 
> repositoryLocation(<that KUrl>)) as of that revision. If the file 
> doesn't map, that is an error.

Aaah, got you :) I wonder wether I'm ever going to make progress on the
other KDev4 stuff if this discussion keeps on rolling ;)

> >> Hmm, I understand where BASE comes from, but I am starting to think HAVE 
> >> would be more obvious. Thoughts?
> > 
> > To be honest I think BASE means more to me than HAVE, BASE == the base
> > version of the file I'm working on, i.e. the file without my
> > modifications. Of course I'm biased by svn/cvs, and if perforce uses
> > HAVE you're biased too Matthew ;)
> 
> Exactly. "HAVE" == what I checked out, i.e. what I "have". BASE is OK, I 
> was just wondering. :-) My brain is still stuck in the perforce rut.

Mine is stuck in subversion rut. So we agree on BASE.

Andreas

-- 
Living your life is a task so difficult, it has never been attempted before.




More information about the KDevelop-devel mailing list