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

VcsBase: Reuse CommandOutputBindMode instead of bool

Browse Source 
Reuse it inside vcsExec() and vcsExecWithHandler().

Change-Id: I6ff4044bf43e0883fc46a49718f5f44da87a7e13
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-08 21:30:00 +01:00
parent 46213c82be
commit 112835922a
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@ void GitBaseDiffEditorController::updateBranchList()
};
m_instance->vcsExecWithHandler(baseDirectory(),
{"branch", noColorOption, "-a", "--contains", revision},
this, commandHandler, RunFlags::None, false);
this, commandHandler, RunFlags::None, CommandOutputBindMode::NoBind);
}
///////////////////////////////
@@ -1489,7 +1489,7 @@ void GitClient::recoverDeletedFiles(const FilePath &workingDirectory)
void GitClient::addFile(const FilePath &workingDirectory, const QString &fileName)
{
vcsExec(workingDirectory, {"add", fileName}, RunFlags::None, false);
vcsExec(workingDirectory, {"add", fileName}, RunFlags::None, CommandOutputBindMode::NoBind);
}
bool GitClient::synchronousLog(const FilePath &workingDirectory, const QStringList &arguments,
@@ -3368,7 +3368,7 @@ VcsCommand *GitClient::vcsExecAbortable(const FilePath &workingDirectory,
if (abortCommand.isEmpty())
abortCommand = arguments.at(0);
VcsCommand *command = createCommand(workingDirectory, nullptr, VcsWindowOutputBind);
VcsCommand *command = createCommand(workingDirectory, nullptr, CommandOutputBindMode::ToVcsWindow);
command->addFlags(RunFlags::ShowStdOut | RunFlags::ShowSuccessMessage);
// For rebase, Git might request an editor (which means the process keeps running until the
// user closes it), so run without timeout.

2
src/plugins/git/gitplugin.cpp
View File

@@ -1584,7 +1584,7 @@ void GitPluginPrivate::instantBlame()
};
GitClient::instance()->vcsExecWithHandler(workingDirectory,
{"blame", "-p", "-L", lineString, "--", filePath.toString()},
this, commandHandler, RunFlags::NoOutput, false);
this, commandHandler, RunFlags::NoOutput, CommandOutputBindMode::NoBind);
}
void GitPluginPrivate::stopInstantBlame()