GitSubmitEditor: Simplify update of files model

Report the commit data fetch result, including success state and error
message, through the QFuture. That also removes the need for creating a
fetcher QObject and the logic to make sure it is deleted.
Also exchange QtConcurrent::run by Utils::runAsync.

Change-Id: I9c0c03eff2eaa32f577b4599ffda58b0c09de59b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/git/gitsubmiteditor.cpp

@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 #include "gitsubmiteditor.h"
-#include "commitdata.h"
 #include "gitclient.h"
 #include "gitplugin.h"
 #include "gitsubmiteditorwidget.h"
@@ -33,6 +32,7 @@
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 #include <vcsbase/submitfilemodel.h>
 #include <vcsbase/vcsoutputwindow.h>
 
@@ -40,7 +40,6 @@
 #include <QStringList>
 #include <QTextCodec>
 #include <QTimer>
-#include <QtConcurrentRun>
 
 static const char TASK_UPDATE_COMMIT[] = "Git.UpdateCommit";
 
@@ -84,37 +83,16 @@ private:
     }
 };
 
-class CommitDataFetcher : public QObject
+CommitDataFetchResult CommitDataFetchResult::fetch(CommitType commitType, const QString &workingDirectory)
-{
-    Q_OBJECT
-
-public:
-    CommitDataFetcher(CommitType commitType, const QString &workingDirectory) :
-        m_commitData(commitType),
-        m_workingDirectory(workingDirectory)
-    {
-    }
-
-    void start()
 {
+    CommitDataFetchResult result;
+    result.commitData.commitType = commitType;
     QString commitTemplate;
-        bool success = GitPlugin::client()->getCommitData(m_workingDirectory, &commitTemplate,
+    result.success = GitPlugin::client()->getCommitData(workingDirectory, &commitTemplate,
-                                                          m_commitData, &m_errorMessage);
+                                                        result.commitData, &result.errorMessage);
-        emit finished(success);
+    return result;
 }
 
-    const CommitData &commitData() const { return m_commitData; }
-    const QString &errorMessage() const { return m_errorMessage; }
-
-signals:
-    void finished(bool result);
-
-private:
-    CommitData m_commitData;
-    QString m_workingDirectory;
-    QString m_errorMessage;
-};
-
 /* The problem with git is that no diff can be obtained to for a random
  * multiselection of staged/unstaged files; it requires the --cached
  * option for staged files. So, we sort apart the diff file lists
@@ -127,11 +105,12 @@ GitSubmitEditor::GitSubmitEditor(const VcsBaseSubmitEditorParameters *parameters
     connect(submitEditorWidget(), &GitSubmitEditorWidget::show, this, &GitSubmitEditor::showCommit);
     connect(GitPlugin::instance()->versionControl(), &Core::IVersionControl::repositoryChanged,
             this, &GitSubmitEditor::forceUpdateFileModel);
+    connect(&m_fetchWatcher, &QFutureWatcher<CommitDataFetchResult>::finished,
+            this, &GitSubmitEditor::commitDataRetrieved);
 }
 
 GitSubmitEditor::~GitSubmitEditor()
 {
-    resetCommitDataFetcher();
 }
 
 GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget()
@@ -144,14 +123,6 @@ const GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget() const
     return static_cast<GitSubmitEditorWidget *>(widget());
 }
 
-void GitSubmitEditor::resetCommitDataFetcher()
-{
-    if (!m_commitDataFetcher)
-        return;
-    disconnect(m_commitDataFetcher, &CommitDataFetcher::finished, this, &GitSubmitEditor::commitDataRetrieved);
-    connect(m_commitDataFetcher, &CommitDataFetcher::finished, m_commitDataFetcher, &QObject::deleteLater);
-}
-
 void GitSubmitEditor::setCommitData(const CommitData &d)
 {
     m_commitEncoding = d.commitEncoding;
@@ -254,13 +225,12 @@ void GitSubmitEditor::updateFileModel()
     if (w->updateInProgress() || m_workingDirectory.isEmpty())
         return;
     w->setUpdateInProgress(true);
-    resetCommitDataFetcher();
+    m_fetchWatcher.setFuture(Utils::runAsync(&CommitDataFetchResult::fetch,
-    m_commitDataFetcher = new CommitDataFetcher(m_commitType, m_workingDirectory);
+                                             m_commitType, m_workingDirectory));
-    connect(m_commitDataFetcher, &CommitDataFetcher::finished, this, &GitSubmitEditor::commitDataRetrieved);
+    Core::ProgressManager::addTask(m_fetchWatcher.future(), tr("Refreshing Commit Data"),
-    QFuture<void> future = QtConcurrent::run(m_commitDataFetcher, &CommitDataFetcher::start);
+                                   TASK_UPDATE_COMMIT);
-    Core::ProgressManager::addTask(future, tr("Refreshing Commit Data"), TASK_UPDATE_COMMIT);
 
-    GitPlugin::client()->addFuture(future);
+    GitPlugin::client()->addFuture(m_fetchWatcher.future());
 }
 
 void GitSubmitEditor::forceUpdateFileModel()
@@ -272,21 +242,20 @@ void GitSubmitEditor::forceUpdateFileModel()
         updateFileModel();
 }
 
-void GitSubmitEditor::commitDataRetrieved(bool success)
+void GitSubmitEditor::commitDataRetrieved()
 {
+    CommitDataFetchResult result = m_fetchWatcher.result();
     GitSubmitEditorWidget *w = submitEditorWidget();
-    if (success) {
+    if (result.success) {
-        setCommitData(m_commitDataFetcher->commitData());
+        setCommitData(result.commitData);
         w->refreshLog(m_workingDirectory);
         w->setEnabled(true);
     } else {
         // Nothing to commit left!
-        VcsOutputWindow::appendError(m_commitDataFetcher->errorMessage());
+        VcsOutputWindow::appendError(result.errorMessage);
         m_model->clear();
         w->setEnabled(false);
     }
-    m_commitDataFetcher->deleteLater();
-    m_commitDataFetcher = 0;
     w->setUpdateInProgress(false);
 }
 
@@ -316,5 +285,3 @@ QByteArray GitSubmitEditor::fileContents() const
 
 } // namespace Internal
 } // namespace Git
-
-#include "gitsubmiteditor.moc"

src/plugins/git/gitsubmiteditor.h

@@ -25,10 +25,11 @@
 
 #pragma once
 
-#include "gitsettings.h" // CommitType
+#include "commitdata.h"
 
 #include <vcsbase/vcsbasesubmiteditor.h>
 
+#include <QFutureWatcher>
 #include <QStringList>
 
 namespace VcsBase { class SubmitFileModel; }
@@ -38,10 +39,18 @@ namespace Internal {
 
 class GitClient;
 class GitSubmitEditorWidget;
-class CommitData;
-class CommitDataFetcher;
 class GitSubmitEditorPanelData;
 
+class CommitDataFetchResult
+{
+public:
+    static CommitDataFetchResult fetch(CommitType commitType, const QString &workingDirectory);
+
+    QString errorMessage;
+    CommitData commitData;
+    bool success;
+};
+
 class GitSubmitEditor : public VcsBase::VcsBaseSubmitEditor
 {
     Q_OBJECT
@@ -63,11 +72,10 @@ protected:
 private:
     void slotDiffSelected(const QList<int> &rows);
     void showCommit(const QString &commit);
-    void commitDataRetrieved(bool success);
+    void commitDataRetrieved();
 
     inline GitSubmitEditorWidget *submitEditorWidget();
     inline const GitSubmitEditorWidget *submitEditorWidget() const;
-    void resetCommitDataFetcher();
 
     VcsBase::SubmitFileModel *m_model = nullptr;
     QTextCodec *m_commitEncoding = nullptr;
@@ -75,7 +83,7 @@ private:
     QString m_amendSHA1;
     QString m_workingDirectory;
     bool m_firstUpdate = true;
-    CommitDataFetcher *m_commitDataFetcher = nullptr;
+    QFutureWatcher<CommitDataFetchResult> m_fetchWatcher;
 };
 
 } // namespace Internal