From 2a2b136624f7d2520c5944c335ecbb3a3bd2b8c3 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 1 Sep 2022 11:49:41 +0200
Subject: [PATCH] VcsCommand: Get rid of abort()

Use destructor of VcsCommand instead.

Change-Id: Ie914d016c6d3d57a88674ce8534d5edec4bc79c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/vcsbase/vcsbaseeditor.cpp |  2 +-
 src/plugins/vcsbase/vcscommand.cpp    | 65 +++++++++++----------------
 src/plugins/vcsbase/vcscommand.h      |  1 -
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 19f93427316..a52fafb17b4 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1387,7 +1387,7 @@ VcsBaseEditorConfig *VcsBaseEditorWidget::editorConfig() const
 void VcsBaseEditorWidget::setCommand(VcsCommand *command)
 {
     if (d->m_command) {
-        d->m_command->abort();
+        delete d->m_command;
         hideProgressIndicator();
     }
     d->m_command = command;
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index 45880f30810..ffd6aae26f9 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -111,7 +111,6 @@ public:
     unsigned m_flags = 0;
 
     bool m_progressiveOutput = false;
-    bool m_aborted = false;
 };
 
 QString VcsCommandPrivate::displayName() const
@@ -216,14 +215,12 @@ bool VcsCommandPrivate::isFullySynchronous() const
 
 void VcsCommandPrivate::handleDone(QtcProcess *process)
 {
-    if (!m_aborted) {
-        // Success/Fail message in appropriate window?
-        if (process->result() == ProcessResult::FinishedWithSuccess) {
-            if (m_flags & VcsCommand::ShowSuccessMessage)
-                emit q->appendMessage(process->exitMessage());
-        } else if (!(m_flags & VcsCommand::SuppressFailMessage)) {
-            emit q->appendError(process->exitMessage());
-        }
+    // Success/Fail message in appropriate window?
+    if (process->result() == ProcessResult::FinishedWithSuccess) {
+        if (m_flags & VcsCommand::ShowSuccessMessage)
+            emit q->appendMessage(process->exitMessage());
+    } else if (!(m_flags & VcsCommand::SuppressFailMessage)) {
+        emit q->appendError(process->exitMessage());
     }
     emit q->runCommandFinished(process->workingDirectory());
 }
@@ -261,18 +258,14 @@ void VcsCommandPrivate::processDone()
         startNextJob();
         return;
     }
-    if (m_aborted) {
-        m_futureInterface.reportCanceled();
-    } else {
-        if (!m_progressiveOutput) {
-            emit q->stdOutText(m_stdOut);
-            if (!m_stdErr.isEmpty())
-                emit q->stdErrText(m_stdErr);
-        }
-        emit q->finished(success);
-        if (!success)
-            m_futureInterface.reportCanceled();
+    if (!m_progressiveOutput) {
+        emit q->stdOutText(m_stdOut);
+        if (!m_stdErr.isEmpty())
+            emit q->stdErrText(m_stdErr);
     }
+    emit q->finished(success);
+    if (!success)
+        m_futureInterface.reportCanceled();
     cleanup();
     // As it is used asynchronously, we need to delete ourselves
     q->deleteLater();
@@ -298,7 +291,11 @@ VcsCommand::VcsCommand(const FilePath &workingDirectory, const Environment &envi
                                     this, &VcsCommand::postRunCommand);
     connect(ICore::instance(), &ICore::coreAboutToClose, this, [this, connection] {
         disconnect(connection);
-        abort();
+        d->m_process.reset();
+        if (d->m_futureInterface.isRunning()) {
+            d->m_futureInterface.reportCanceled();
+            d->cleanup();
+        }
     });
 }
 
@@ -357,12 +354,6 @@ void VcsCommand::execute()
         ProgressManager::addTimedTask(d->m_futureInterface, name, id, qMax(2, d->timeoutS() / 5));
 }
 
-void VcsCommand::abort()
-{
-    d->m_aborted = true;
-    d->m_watcher.future().cancel();
-}
-
 void VcsCommand::cancel()
 {
     d->m_futureInterface.reportCanceled();
@@ -404,18 +395,16 @@ void VcsCommand::runFullySynchronous(QtcProcess &process)
 {
     process.runBlocking();
 
-    if (!d->m_aborted) {
-        const QString stdErr = process.cleanedStdErr();
-        if (!stdErr.isEmpty() && !(d->m_flags & SuppressStdErr))
-            emit append(stdErr);
+    const QString stdErr = process.cleanedStdErr();
+    if (!stdErr.isEmpty() && !(d->m_flags & SuppressStdErr))
+        emit append(stdErr);
 
-        const QString stdOut = process.cleanedStdOut();
-        if (!stdOut.isEmpty() && d->m_flags & ShowStdOut) {
-            if (d->m_flags & SilentOutput)
-                emit appendSilently(stdOut);
-            else
-                emit append(stdOut);
-        }
+    const QString stdOut = process.cleanedStdOut();
+    if (!stdOut.isEmpty() && d->m_flags & ShowStdOut) {
+        if (d->m_flags & SilentOutput)
+            emit appendSilently(stdOut);
+        else
+            emit append(stdOut);
     }
 }
 
diff --git a/src/plugins/vcsbase/vcscommand.h b/src/plugins/vcsbase/vcscommand.h
index 0cd6ea36ea2..818eaf63c4c 100644
--- a/src/plugins/vcsbase/vcscommand.h
+++ b/src/plugins/vcsbase/vcscommand.h
@@ -105,7 +105,6 @@ public:
                 const Utils::FilePath &workingDirectory = {},
                 const Utils::ExitCodeInterpreter &interpreter = {});
     void execute(); // Execute tasks asynchronously!
-    void abort();
 
     void addFlags(unsigned f);