diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index b81c316db79..4a2889d9f0b 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -3286,8 +3286,7 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url) workingDirectory.cdUp(); const SynchronousProcessResponse resp = synchronousGit(workingDirectory.path(), arguments, flags); - // TODO: Turn this into a VcsBaseClient and use resetCachedVcsInfo(...) - VcsManager::resetVersionControlForDirectory(workingDirectory.absolutePath()); + resetCachedVcsInfo(workingDirectory.absolutePath()); return (resp.result == SynchronousProcessResponse::Finished); } } diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 64db7df7a63..e0198f5cfea 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -171,6 +171,11 @@ QProcessEnvironment VcsBaseClientImpl::processEnvironment() const return environment; } +void VcsBaseClientImpl::resetCachedVcsInfo(const QString &workingDir) +{ + Core::VcsManager::resetVersionControlForDirectory(workingDir); +} + int VcsBaseClientImpl::vcsTimeout() const { return settings().intValue(VcsBaseClientSettings::timeoutKey); @@ -627,11 +632,6 @@ VcsBaseEditorWidget *VcsBaseClient::createVcsEditor(Core::Id kind, QString title return baseEditor; } -void VcsBaseClient::resetCachedVcsInfo(const QString &workingDir) -{ - Core::VcsManager::resetVersionControlForDirectory(workingDir); -} - void VcsBaseClient::statusParser(const QString &text) { QList lineInfoList; diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index f344bad3b9f..d176e926768 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -90,6 +90,9 @@ public: virtual QProcessEnvironment processEnvironment() const; +protected: + void resetCachedVcsInfo(const QString &workingDir); + private: void saveSettings(); void commandFinishedGotoLine(QWidget*); @@ -214,8 +217,6 @@ protected: const char *registerDynamicProperty, const QString &dynamicPropertyValue) const; - void resetCachedVcsInfo(const QString &workingDir); - private: void statusParser(const QString&); void annotateRevision(const QString&, const QString&, const QString&, int);