Commit 60b2a4c0 authored by Fabian Wiesel's avatar Fabian Wiesel
Browse files

VCS: Extend the specification of checkout to encompass the DVCS case, renamed...

VCS: Extend the specification of checkout to encompass the DVCS case, renamed checkout() to createWorkingCopy()
parent b1ef1e47
......@@ -110,7 +110,7 @@ VcsJob* GitPlugin::init(const KUrl &directory)
return NULL;
}
VcsJob* GitPlugin::clone(const KDevelop::VcsLocation & localOrRepoLocationSrc, const KUrl& localRepositoryRoot)
VcsJob* GitPlugin::createWorkingCopy(const KDevelop::VcsLocation & localOrRepoLocationSrc, const KUrl& localRepositoryRoot, KDevelop::IBasicVersionControl::RecursionMode)
{
DVcsJob* job = new DVcsJob(this);
if (prepareJob(job, localRepositoryRoot.toLocalFile(), GitPlugin::Init) ) {
......
......@@ -54,6 +54,9 @@ public:
KDevelop::VcsJob* add(const KUrl::List& localLocations,
KDevelop::IBasicVersionControl::RecursionMode recursion = KDevelop::IBasicVersionControl::Recursive);
KDevelop::VcsJob* createWorkingCopy(const KDevelop::VcsLocation & localOrRepoLocationSrc,
const KUrl& localRepositoryRoot, KDevelop::IBasicVersionControl::RecursionMode);
KDevelop::VcsJob* remove(const KUrl::List& files);
KDevelop::VcsJob* status(const KUrl::List& localLocations,
KDevelop::IBasicVersionControl::RecursionMode recursion = KDevelop::IBasicVersionControl::Recursive);
......@@ -69,9 +72,6 @@ public:
// Begin: KDevelop::IDistributedVersionControl
KDevelop::VcsJob* init(const KUrl & directory);
KDevelop::VcsJob* clone(const KDevelop::VcsLocation & localOrRepoLocationSrc,
const KUrl& localRepositoryRoot);
KDevelop::VcsJob* reset(const KUrl& repository,
const QStringList &args,
const KUrl::List& files);
......
......@@ -304,7 +304,7 @@ void GitInitTest::commitFiles()
// {
// kDebug() << "Do not clone people, clone Git repos!";
// // make job that clones the local repository, created in the previous test
// DVcsJob* j = m_proxy->clone(KUrl(gitTest_BaseDir), KUrl(gitTest_BaseDir2));
// DVcsJob* j = m_proxy->createWorkingCopy(KUrl(gitTest_BaseDir), KUrl(gitTest_BaseDir2));
// QVERIFY( j );
//
// // try to start the job
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment