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

GitClient: Simplify vcsExec

Browse Source 
Get rid of editor arg.
Reorder last two args (to conform to vcsExecWithHandler).

Change-Id: Ia32757ac8b766640b76bef81f1b2e0f5efe4d48c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-08 20:52:03 +01:00
parent 0cdfac0cb5
commit 46213c82be
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1308,7 +1308,7 @@ void GitClient::archive(const FilePath &workingDirectory, QString commit)
} }
} }
vcsExec(workingDirectory, {"archive", commit, "-o", archive.absoluteFilePath()}, nullptr, true); vcsExec(workingDirectory, {"archive", commit, "-o", archive.absoluteFilePath()});
} }
VcsBaseEditorWidget *GitClient::annotate( VcsBaseEditorWidget *GitClient::annotate(
@@ -1457,7 +1457,7 @@ void GitClient::reset(const FilePath &workingDirectory, const QString &argument,
} }
flags |= RunFlags::ExpectRepoChanges; flags |= RunFlags::ExpectRepoChanges;
} }
vcsExec(workingDirectory, arguments, nullptr, true, flags); vcsExec(workingDirectory, arguments, flags);
} }
void GitClient::removeStaleRemoteBranches(const FilePath &workingDirectory, const QString &remote) void GitClient::removeStaleRemoteBranches(const FilePath &workingDirectory, const QString &remote)
@@ -1489,7 +1489,7 @@ void GitClient::recoverDeletedFiles(const FilePath &workingDirectory)
void GitClient::addFile(const FilePath &workingDirectory, const QString &fileName) void GitClient::addFile(const FilePath &workingDirectory, const QString &fileName)
{ {
vcsExec(workingDirectory, {"add", fileName}); vcsExec(workingDirectory, {"add", fileName}, RunFlags::None, false);
} }
bool GitClient::synchronousLog(const FilePath &workingDirectory, const QStringList &arguments, bool GitClient::synchronousLog(const FilePath &workingDirectory, const QStringList &arguments,
@@ -3234,7 +3234,7 @@ void GitClient::subversionLog(const FilePath &workingDirectory) const
void GitClient::subversionDeltaCommit(const FilePath &workingDirectory) const void GitClient::subversionDeltaCommit(const FilePath &workingDirectory) const
{ {
vcsExec(workingDirectory, {"svn", "dcommit"}, nullptr, true, RunFlags::ShowSuccessMessage); vcsExec(workingDirectory, {"svn", "dcommit"}, RunFlags::ShowSuccessMessage);
} }
enum class PushFailure { Unknown, NonFastForward, NoRemoteBranch }; enum class PushFailure { Unknown, NonFastForward, NoRemoteBranch };

8
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -180,14 +180,12 @@ void VcsBaseClientImpl::vcsExecWithHandler(const FilePath &workingDirectory,
void VcsBaseClientImpl::vcsExec(const FilePath &workingDirectory, void VcsBaseClientImpl::vcsExec(const FilePath &workingDirectory,
const QStringList &arguments, const QStringList &arguments,
VcsBaseEditorWidget *editor, bool useOutputToWindow, RunFlags additionalFlags,
RunFlags additionalFlags) const bool useOutputToWindow) const
{ {
VcsCommand *command = createCommand(workingDirectory, editor, VcsCommand *command = createCommand(workingDirectory, nullptr,
useOutputToWindow ? VcsWindowOutputBind : NoOutputBind); useOutputToWindow ? VcsWindowOutputBind : NoOutputBind);
command->addFlags(additionalFlags); command->addFlags(additionalFlags);
if (editor)
command->setCodec(editor->codec());
command->addJob({vcsBinary(), arguments}, vcsTimeoutS()); command->addJob({vcsBinary(), arguments}, vcsTimeoutS());
command->start(); command->start();
} }

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

@@ -93,12 +93,10 @@ public:
const CommandHandler &handler, const CommandHandler &handler,
RunFlags additionalFlags = RunFlags::None, RunFlags additionalFlags = RunFlags::None,
bool useOutputToWindow = true) const; bool useOutputToWindow = true) const;
// Simple helper to execute a single command using createCommand and enqueueJob.
void vcsExec(const Utils::FilePath &workingDirectory, void vcsExec(const Utils::FilePath &workingDirectory,
const QStringList &arguments, const QStringList &arguments,
VcsBaseEditorWidget *editor = nullptr, RunFlags additionalFlags = RunFlags::None,
bool useOutputToWindow = false, bool useOutputToWindow = true) const;
RunFlags additionalFlags = RunFlags::None) const;
void vcsExecWithEditor(const Utils::FilePath &workingDirectory, void vcsExecWithEditor(const Utils::FilePath &workingDirectory,
const QStringList &arguments, const QStringList &arguments,
VcsBaseEditorWidget *editor) const; VcsBaseEditorWidget *editor) const;