feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: Move resetCachedVcsInfo into VcsBaseClientImpl

Browse Source 
Change-Id: I544472d2024bd82039908c67ab133556617b4fdb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-03-27 15:33:38 +01:00
parent 07d6757ca8
commit 68045c1d0d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.cpp
View File

@@ -3286,8 +3286,7 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url)
workingDirectory.cdUp(); workingDirectory.cdUp();
const SynchronousProcessResponse resp = const SynchronousProcessResponse resp =
synchronousGit(workingDirectory.path(), arguments, flags); synchronousGit(workingDirectory.path(), arguments, flags);
// TODO: Turn this into a VcsBaseClient and use resetCachedVcsInfo(...) resetCachedVcsInfo(workingDirectory.absolutePath());
VcsManager::resetVersionControlForDirectory(workingDirectory.absolutePath());
return (resp.result == SynchronousProcessResponse::Finished); return (resp.result == SynchronousProcessResponse::Finished);
} }
} }

10
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -171,6 +171,11 @@ QProcessEnvironment VcsBaseClientImpl::processEnvironment() const
return environment; return environment;
} }
void VcsBaseClientImpl::resetCachedVcsInfo(const QString &workingDir)
{
Core::VcsManager::resetVersionControlForDirectory(workingDir);
}
int VcsBaseClientImpl::vcsTimeout() const int VcsBaseClientImpl::vcsTimeout() const
{ {
return settings().intValue(VcsBaseClientSettings::timeoutKey); return settings().intValue(VcsBaseClientSettings::timeoutKey);
@@ -627,11 +632,6 @@ VcsBaseEditorWidget *VcsBaseClient::createVcsEditor(Core::Id kind, QString title
return baseEditor; return baseEditor;
} }
void VcsBaseClient::resetCachedVcsInfo(const QString &workingDir)
{
Core::VcsManager::resetVersionControlForDirectory(workingDir);
}
void VcsBaseClient::statusParser(const QString &text) void VcsBaseClient::statusParser(const QString &text)
{ {
QList<VcsBaseClient::StatusItem> lineInfoList; QList<VcsBaseClient::StatusItem> lineInfoList;

5
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -90,6 +90,9 @@ public:
virtual QProcessEnvironment processEnvironment() const; virtual QProcessEnvironment processEnvironment() const;
protected:
void resetCachedVcsInfo(const QString &workingDir);
private: private:
void saveSettings(); void saveSettings();
void commandFinishedGotoLine(QWidget*); void commandFinishedGotoLine(QWidget*);
@@ -214,8 +217,6 @@ protected:
const char *registerDynamicProperty, const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const; const QString &dynamicPropertyValue) const;
void resetCachedVcsInfo(const QString &workingDir);
private: private:
void statusParser(const QString&); void statusParser(const QString&);
void annotateRevision(const QString&, const QString&, const QString&, int); void annotateRevision(const QString&, const QString&, const QString&, int);