diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp index f1e243c6bda..a3a1339c04e 100644 --- a/src/plugins/bazaar/bazaarcontrol.cpp +++ b/src/plugins/bazaar/bazaarcontrol.cpp @@ -86,7 +86,6 @@ bool BazaarControl::supportsOperation(Operation operation) const case Core::IVersionControl::MoveOperation: case Core::IVersionControl::CreateRepositoryOperation: case Core::IVersionControl::AnnotateOperation: - case Core::IVersionControl::GetRepositoryRootOperation: break; case Core::IVersionControl::SnapshotOperations: supported = false; @@ -134,13 +133,6 @@ bool BazaarControl::vcsAnnotate(const QString &file, int line) return true; } -QString BazaarControl::vcsGetRepositoryURL(const QString &directory) -{ - const QString repositoryRoot = m_bazaarClient->findTopLevelForFile(directory); - const BranchInfo branchInfo = m_bazaarClient->synchronousBranchQuery(repositoryRoot); - return branchInfo.isBoundToBranch ? branchInfo.branchLocation : QString(); -} - void BazaarControl::changed(const QVariant &v) { switch (v.type()) { diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h index a93389eb0ec..b2bb7f86330 100644 --- a/src/plugins/bazaar/bazaarcontrol.h +++ b/src/plugins/bazaar/bazaarcontrol.h @@ -62,7 +62,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool vcsAnnotate(const QString &file, int line); public slots: diff --git a/src/plugins/clearcase/clearcasecontrol.cpp b/src/plugins/clearcase/clearcasecontrol.cpp index d95a2ca60ee..0b30e8bc1f6 100644 --- a/src/plugins/clearcase/clearcasecontrol.cpp +++ b/src/plugins/clearcase/clearcasecontrol.cpp @@ -77,7 +77,6 @@ bool ClearCaseControl::supportsOperation(Operation operation) const case DeleteOperation: case MoveOperation: case AnnotateOperation: - case GetRepositoryRootOperation: break; case CreateRepositoryOperation: case SnapshotOperations: @@ -139,11 +138,6 @@ bool ClearCaseControl::vcsMove(const QString &from, const QString &to) return m_plugin->vcsMove(ifrom.absolutePath(), ifrom.fileName(), ito.fileName()); } -QString ClearCaseControl::vcsGetRepositoryURL(const QString &directory) -{ - return m_plugin->vcsGetRepositoryURL(directory); -} - bool ClearCaseControl::managesDirectory(const QString &directory, QString *topLevel) const { return m_plugin->managesDirectory(directory, topLevel); diff --git a/src/plugins/clearcase/clearcasecontrol.h b/src/plugins/clearcase/clearcasecontrol.h index 4e75b81b173..bd8e1702bd9 100644 --- a/src/plugins/clearcase/clearcasecontrol.h +++ b/src/plugins/clearcase/clearcasecontrol.h @@ -61,7 +61,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool vcsAnnotate(const QString &file, int line); diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index cf6e22db37d..e7750a014f0 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1851,11 +1851,6 @@ bool ClearCasePlugin::vcsCheckout(const QString & /*directory*/, const QByteArra return false; } -QString ClearCasePlugin::vcsGetRepositoryURL(const QString & /*directory*/) -{ - return currentState().topLevel(); -} - /// /// Check if the directory is managed under ClearCase control. /// diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index 828936c6c85..3ea61d7cd8a 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -144,7 +144,6 @@ public: bool vcsSetActivity(const QString &workingDir, const QString &title, const QString &activity); bool managesDirectory(const QString &directory, QString *topLevel = 0) const; bool vcsCheckout(const QString &directory, const QByteArray &url); - QString vcsGetRepositoryURL(const QString &directory); static ClearCasePlugin *instance(); diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index bc30acaec8d..3c6e5bb861a 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -56,9 +56,8 @@ public: AddOperation, DeleteOperation, MoveOperation, CreateRepositoryOperation, SnapshotOperations, - AnnotateOperation, - GetRepositoryRootOperation - }; + AnnotateOperation + }; enum OpenSupportMode { NoOpen, /*!< Files can be edited without noticing the VCS */ @@ -168,11 +167,6 @@ public: */ virtual bool vcsCreateRepository(const QString &directory) = 0; - /*! - * Called to get the version control repository root. - */ - virtual QString vcsGetRepositoryURL(const QString &directory) = 0; - /*! * Topic (e.g. name of the current branch) */ @@ -245,7 +239,6 @@ public: bool vcsDelete(const QString &) { return false; } bool vcsMove(const QString &, const QString &) { return false; } bool vcsCreateRepository(const QString &) { return false; } - QString vcsGetRepositoryURL(const QString &) { return QString(); } bool vcsAnnotate(const QString &, int) { return false; } private: diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 872369dc876..768a3d0fb60 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -74,7 +74,6 @@ bool CvsControl::supportsOperation(Operation operation) const case MoveOperation: case CreateRepositoryOperation: case SnapshotOperations: - case GetRepositoryRootOperation: rc = false; break; } @@ -117,11 +116,6 @@ bool CvsControl::vcsCreateRepository(const QString &) return false; } -QString CvsControl::vcsGetRepositoryURL(const QString &) -{ - return QString(); -} - bool CvsControl::vcsAnnotate(const QString &file, int line) { const QFileInfo fi(file); diff --git a/src/plugins/cvs/cvscontrol.h b/src/plugins/cvs/cvscontrol.h index 0756e6921fc..22f7486046e 100644 --- a/src/plugins/cvs/cvscontrol.h +++ b/src/plugins/cvs/cvscontrol.h @@ -59,7 +59,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool vcsAnnotate(const QString &file, int line); QString vcsOpenText() const; diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1ea6220e007..55d54cb0b0f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -3472,20 +3472,6 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url) } } -QString GitClient::vcsGetRepositoryURL(const QString &directory) -{ - QStringList arguments(QLatin1String("config")); - QByteArray outputText; - - arguments << QLatin1String("remote.origin.url"); - - if (fullySynchronousGit(directory, arguments, &outputText, 0, - VcsBasePlugin::SuppressCommandLogging)) { - return commandOutputFromLocal8Bit(outputText); - } - return QString(); -} - GitSettings *GitClient::settings() const { return m_settings; diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index b0fc3165f1d..1abfea5fb6f 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -253,7 +253,6 @@ public: bool isFastForwardMerge(const QString &workingDirectory, const QString &branch); bool cloneRepository(const QString &directory, const QByteArray &url); - QString vcsGetRepositoryURL(const QString &directory); void fetch(const QString &workingDirectory, const QString &remote); bool synchronousPull(const QString &workingDirectory, bool rebase); void push(const QString &workingDirectory, const QStringList &pushArgs = QStringList()); diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index b4753c3fd1b..4eb9d2047c8 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -98,7 +98,6 @@ bool GitVersionControl::supportsOperation(Operation operation) const case CreateRepositoryOperation: case SnapshotOperations: case AnnotateOperation: - case GetRepositoryRootOperation: return true; } return false; @@ -133,11 +132,6 @@ bool GitVersionControl::vcsCreateRepository(const QString &directory) return m_client->synchronousInit(directory); } -QString GitVersionControl::vcsGetRepositoryURL(const QString &directory) -{ - return m_client->vcsGetRepositoryURL(directory); -} - QString GitVersionControl::vcsTopic(const QString &directory) { QString topic = Core::IVersionControl::vcsTopic(directory); diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h index f943a6bde4b..a40322ad0c0 100644 --- a/src/plugins/git/gitversioncontrol.h +++ b/src/plugins/git/gitversioncontrol.h @@ -58,7 +58,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool vcsAnnotate(const QString &file, int line); QString vcsTopic(const QString &directory); diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 0886bdb2e08..2347d5f50c6 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -251,18 +251,6 @@ QString MercurialClient::shortDescriptionSync(const QString &workingDirectory, return shortDescriptionSync(workingDirectory, revision, QLatin1String(defaultFormatC)); } -QString MercurialClient::vcsGetRepositoryURL(const QString &directory) -{ - QByteArray output; - - QStringList arguments(QLatin1String("showconfig")); - arguments << QLatin1String("paths.default"); - - if (vcsFullySynchronousExec(directory, arguments, &output)) - return QString::fromLocal8Bit(output); - return QString(); -} - bool MercurialClient::managesFile(const QString &workingDirectory, const QString &fileName) const { QStringList args; diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h index a6c7fcb254f..6fffe2f0b47 100644 --- a/src/plugins/mercurial/mercurialclient.h +++ b/src/plugins/mercurial/mercurialclient.h @@ -63,7 +63,6 @@ public: QString shortDescriptionSync(const QString &workingDirectory, const QString &revision); void incoming(const QString &repositoryRoot, const QString &repository = QString()); void outgoing(const QString &repositoryRoot); - QString vcsGetRepositoryURL(const QString &directory); bool managesFile(const QString &workingDirectory, const QString &fileName) const; void annotate(const QString &workingDir, const QString &file, diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp index e5d384f9606..ce54b19c9f7 100644 --- a/src/plugins/mercurial/mercurialcontrol.cpp +++ b/src/plugins/mercurial/mercurialcontrol.cpp @@ -112,7 +112,6 @@ bool MercurialControl::supportsOperation(Operation operation) const case Core::IVersionControl::MoveOperation: case Core::IVersionControl::CreateRepositoryOperation: case Core::IVersionControl::AnnotateOperation: - case Core::IVersionControl::GetRepositoryRootOperation: break; case Core::IVersionControl::SnapshotOperations: supported = false; @@ -171,11 +170,6 @@ bool MercurialControl::sccManaged(const QString &filename) return mercurialClient->manifestSync(topLevel, topLevelDir.relativeFilePath(filename)); } -QString MercurialControl::vcsGetRepositoryURL(const QString &directory) -{ - return mercurialClient->vcsGetRepositoryURL(directory); -} - void MercurialControl::changed(const QVariant &v) { switch (v.type()) { diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h index 422f5bccb6f..8788b3497a0 100644 --- a/src/plugins/mercurial/mercurialcontrol.h +++ b/src/plugins/mercurial/mercurialcontrol.h @@ -62,7 +62,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool sccManaged(const QString &filename); bool vcsAnnotate(const QString &file, int line); diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp index ce0ac3cf9c8..112b5de9c77 100644 --- a/src/plugins/perforce/perforceversioncontrol.cpp +++ b/src/plugins/perforce/perforceversioncontrol.cpp @@ -76,7 +76,6 @@ bool PerforceVersionControl::supportsOperation(Operation operation) const return supported; case CreateRepositoryOperation: case SnapshotOperations: - case GetRepositoryRootOperation: break; } return false; @@ -133,11 +132,6 @@ bool PerforceVersionControl::vcsAnnotate(const QString &file, int line) return true; } -QString PerforceVersionControl::vcsGetRepositoryURL(const QString &) -{ - return QString(); -} - QString PerforceVersionControl::vcsOpenText() const { return tr("&Edit"); diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h index dc96aebec7e..6db69e73b43 100644 --- a/src/plugins/perforce/perforceversioncontrol.h +++ b/src/plugins/perforce/perforceversioncontrol.h @@ -59,7 +59,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool vcsAnnotate(const QString &file, int line); QString vcsOpenText() const; QString vcsMakeWritableText() const; diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp index d52d461d109..23b31b336a1 100644 --- a/src/plugins/subversion/subversioncontrol.cpp +++ b/src/plugins/subversion/subversioncontrol.cpp @@ -93,7 +93,6 @@ bool SubversionControl::supportsOperation(Operation operation) const case DeleteOperation: case MoveOperation: case AnnotateOperation: - case GetRepositoryRootOperation: break; case CreateRepositoryOperation: case SnapshotOperations: @@ -128,11 +127,6 @@ bool SubversionControl::vcsMove(const QString &from, const QString &to) return m_plugin->vcsMove(fromInfo.absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath()); } -QString SubversionControl::vcsGetRepositoryURL(const QString &directory) -{ - return m_plugin->vcsGetRepositoryURL(directory); -} - bool SubversionControl::vcsCreateRepository(const QString &) { return false; diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h index 7aab3bf86e2..6c9a179f157 100644 --- a/src/plugins/subversion/subversioncontrol.h +++ b/src/plugins/subversion/subversioncontrol.h @@ -57,7 +57,6 @@ public: bool vcsDelete(const QString &filename); bool vcsMove(const QString &from, const QString &to); bool vcsCreateRepository(const QString &directory); - QString vcsGetRepositoryURL(const QString &directory); bool vcsAnnotate(const QString &file, int line); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index d462a52da35..710c8e6fb04 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -1104,45 +1104,6 @@ bool SubversionPlugin::vcsCheckout(const QString &directory, const QByteArray &u } -QString SubversionPlugin::vcsGetRepositoryURL(const QString &directory) -{ - QXmlStreamReader xml; - QStringList args = QStringList(QLatin1String("info")); - args << SubversionClient::addAuthenticationOptions(settings()) << QLatin1String("--xml"); - - const SubversionResponse response = runSvn(directory, args, 10 * m_settings.timeOutMs(), SuppressCommandLogging); - xml.addData(response.stdOut); - - bool repo = false; - bool root = false; - - while (!xml.atEnd() && !xml.hasError()) { - switch (xml.readNext()) { - case QXmlStreamReader::StartDocument: - break; - case QXmlStreamReader::StartElement: - if (xml.name() == QLatin1String("repository")) - repo = true; - else if (repo && xml.name() == QLatin1String("root")) - root = true; - break; - case QXmlStreamReader::EndElement: - if (xml.name() == QLatin1String("repository")) - repo = false; - else if (repo && xml.name() == QLatin1String("root")) - root = false; - break; - case QXmlStreamReader::Characters: - if (repo && root) - return xml.text().toString(); - break; - default: - break; - } - } - return QString(); -} - bool SubversionPlugin::managesDirectory(const QString &directory, QString *topLevel /* = 0 */) const { const QDir dir(directory); diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index 5777c877df2..d179c1a0345 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -87,7 +87,6 @@ public: bool managesDirectory(const QString &directory, QString *topLevel = 0) const; bool managesFile(const QString &workingDirectory, const QString &fileName) const; bool vcsCheckout(const QString &directory, const QByteArray &url); - QString vcsGetRepositoryURL(const QString &directory); static SubversionPlugin *instance();