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

GitPlugin: Use PluginManager's futureSynchronizer

Browse Source 
It's being deleted on plugin unload, so it should be
a proper substitute.

Change-Id: I27383db72dfa0d5b0df2886b24c96266602ccbac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-25 17:09:48 +02:00
parent 93305b49b8
commit d30bb92704
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3099,11 +3099,6 @@ void GitClient::handleMergeConflicts(const FilePath &workingDir, const QString &
} }
} }
void GitClient::addFuture(const QFuture<void> &future)
{
m_synchronizer.addFuture(future);
}
// Subversion: git svn // Subversion: git svn
void GitClient::synchronousSubversionFetch(const FilePath &workingDirectory) const void GitClient::synchronousSubversionFetch(const FilePath &workingDirectory) const
{ {

4
src/plugins/git/gitclient.h
View File

@@ -12,7 +12,6 @@
#include <vcsbase/vcsbaseclient.h> #include <vcsbase/vcsbaseclient.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/futuresynchronizer.h>
#include <utils/process.h> #include <utils/process.h>
#include <QObject> #include <QObject>
@@ -331,7 +330,6 @@ public:
bool isValidRevision(const QString &revision) const; bool isValidRevision(const QString &revision) const;
void handleMergeConflicts(const Utils::FilePath &workingDir, const QString &commit, void handleMergeConflicts(const Utils::FilePath &workingDir, const QString &commit,
const QStringList &files, const QString &abortCommand); const QStringList &files, const QString &abortCommand);
void addFuture(const QFuture<void> &future);
static QString msgNoChangedFiles(); static QString msgNoChangedFiles();
static QString msgNoCommits(bool includeRemote); static QString msgNoCommits(bool includeRemote);
@@ -406,8 +404,6 @@ private:
QString m_diffCommit; QString m_diffCommit;
Utils::FilePaths m_updatedSubmodules; Utils::FilePaths m_updatedSubmodules;
bool m_disableEditor = false; bool m_disableEditor = false;
// The synchronizer has cancelOnWait set to true by default.
Utils::FutureSynchronizer m_synchronizer; // for commit updates
}; };
class GitRemote : public Core::IVersionControl::RepoUrl class GitRemote : public Core::IVersionControl::RepoUrl

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

@@ -11,6 +11,7 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/async.h> #include <utils/async.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <vcsbase/submitfilemodel.h> #include <vcsbase/submitfilemodel.h>
@@ -209,7 +210,7 @@ void GitSubmitEditor::updateFileModel()
Core::ProgressManager::addTask(m_fetchWatcher.future(), Tr::tr("Refreshing Commit Data"), Core::ProgressManager::addTask(m_fetchWatcher.future(), Tr::tr("Refreshing Commit Data"),
TASK_UPDATE_COMMIT); TASK_UPDATE_COMMIT);
GitClient::instance()->addFuture(QFuture<void>(m_fetchWatcher.future())); ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_fetchWatcher.future());
} }
void GitSubmitEditor::forceUpdateFileModel() void GitSubmitEditor::forceUpdateFileModel()