VcsBase: Get rid of CommandOutputBindMode

Simplify createCommand() implementation. All callers
passed either non-null editor (in this case the
bindMode was always NoBind) or passed a null editor and one
of two values for bindMode (in this case the only
effect was to add (or not) a RunFlags::ShowStdOut flag).

Drop CommandOutputBindMode enum completely and pass
directly RunFlags::ShowStdOut when needed (i.e. in cases
we were passing CommandOutputBindMode::ToVcsWindow).

Change-Id: Ic3af05818933a03f615ba02267403b9f0bd326ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-09 13:49:13 +01:00
parent 834f89acf2
commit 8d7ced7d83
4 changed files with 35 additions and 46 deletions

View File

@@ -30,11 +30,6 @@ class VcsBaseEditorConfig;
class VcsBaseEditorWidget;
class VcsCommand;
enum class CommandOutputBindMode {
NoBind,
ToVcsWindow
};
using CommandHandler = std::function<void(const CommandResult &)>;
class VCSBASE_EXPORT VcsBaseClientImpl : public QObject
@@ -59,8 +54,7 @@ public:
const QString &dynamicPropertyValue) const;
VcsCommand *createCommand(const Utils::FilePath &workingDirectory,
VcsBaseEditorWidget *editor = nullptr,
CommandOutputBindMode mode = CommandOutputBindMode::NoBind) const;
VcsBaseEditorWidget *editor = nullptr) const;
void enqueueJob(VcsCommand *cmd, const QStringList &args,
const Utils::ExitCodeInterpreter &interpreter = {}) const;
@@ -91,12 +85,10 @@ public:
const QStringList &arguments,
const QObject *context,
const CommandHandler &handler,
RunFlags additionalFlags = RunFlags::None,
CommandOutputBindMode bindMode = CommandOutputBindMode::ToVcsWindow) const;
RunFlags additionalFlags = RunFlags::None) const;
void vcsExec(const Utils::FilePath &workingDirectory,
const QStringList &arguments,
RunFlags additionalFlags = RunFlags::None,
CommandOutputBindMode bindMode = CommandOutputBindMode::ToVcsWindow) const;
RunFlags additionalFlags = RunFlags::None) const;
void vcsExecWithEditor(const Utils::FilePath &workingDirectory,
const QStringList &arguments,
VcsBaseEditorWidget *editor) const;