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

VcsBase: Introduce vcsExecWithHandler()

Browse Source 
Before, vcsExec() returned already started VcsCommand.
Later, callers of vcsExec() were establishing connections
to the retured VcsCommand::done() signal. However, when
process fails to start (e.g. because of non-existing
executable), the done() signal may be emitted synchonously
from inside VcsCommand::start(). In this scenario
callers of VcsCommand could miss the emission of done()
signal and connect to already finished command.

Instead, provide a vcsExecWithHandler() function which
takes a handler to be called when command finished.
In addition it takes the context object, too.
Don't return VcsCommand from vcsExec() anymore.

Change-Id: I2fb5fbe5d27632ea039c650d37e5d7d1b60cebc0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-08 18:50:54 +01:00
parent c08317b5a6
commit 287a7c9268
11 changed files with 193 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@ class VcsBaseEditorConfig;
class VcsBaseEditorWidget;
class VcsCommand;
using CommandHandler = std::function<void(const CommandResult &)>;
class VCSBASE_EXPORT VcsBaseClientImpl : public QObject
{
Q_OBJECT
@@ -85,12 +87,18 @@ public:
RunFlags flags = RunFlags::None,
int timeoutS = -1, QTextCodec *codec = nullptr) const;
void vcsExecWithHandler(const Utils::FilePath &workingDirectory,
const QStringList &arguments,
const QObject *context,
const CommandHandler &handler,
RunFlags additionalFlags = RunFlags::None,
bool useOutputToWindow = true) const;
// Simple helper to execute a single command using createCommand and enqueueJob.
VcsCommand *vcsExec(const Utils::FilePath &workingDirectory,
const QStringList &arguments,
VcsBaseEditorWidget *editor = nullptr,
bool useOutputToWindow = false,
RunFlags additionalFlags = RunFlags::None) const;
void vcsExec(const Utils::FilePath &workingDirectory,
const QStringList &arguments,
VcsBaseEditorWidget *editor = nullptr,
bool useOutputToWindow = false,
RunFlags additionalFlags = RunFlags::None) const;
protected:
void resetCachedVcsInfo(const Utils::FilePath &workingDir);