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

Git: Add CommandHandler into vcsExecAbortable

Browse Source 
Don't return VcsCommand anymore.

Change-Id: I895951e8bd8d380d7b946380628e41b928c9b743
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-09 16:37:03 +01:00
parent ac2ca7244a
commit 305dc46902
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3110,11 +3110,11 @@ void GitClient::pull(const FilePath &workingDirectory, bool rebase)
abortCommand = "merge";
}
VcsCommand *command = vcsExecAbortable(workingDirectory, arguments, rebase, abortCommand);
connect(command, &VcsCommand::done, this, [this, workingDirectory, command] {
if (command->result() == ProcessResult::FinishedWithSuccess)
const auto commandHandler = [this, workingDirectory](const CommandResult &result) {
if (result.result() == ProcessResult::FinishedWithSuccess)
updateSubmodulesIfNeeded(workingDirectory, true);
});
};
vcsExecAbortable(workingDirectory, arguments, rebase, abortCommand, this, commandHandler);
}
void GitClient::synchronousAbortCommand(const FilePath &workingDir, const QString &abortCommand)
@@ -3363,26 +3363,27 @@ void GitClient::revert(const FilePath &workingDirectory, const QString &argument
// Executes a command asynchronously. Work tree is expected to be clean.
// Stashing is handled prior to this call.
VcsCommand *GitClient::vcsExecAbortable(const FilePath &workingDirectory,
const QStringList &arguments,
bool isRebase,
QString abortCommand)
void GitClient::vcsExecAbortable(const FilePath &workingDirectory, const QStringList &arguments,
bool isRebase, const QString &abortCommand,
const QObject *context, const CommandHandler &handler)
{
QTC_ASSERT(!arguments.isEmpty(), return nullptr);
if (abortCommand.isEmpty())
abortCommand = arguments.at(0);
QTC_ASSERT(!arguments.isEmpty(), return);
const QString abortString = abortCommand.isEmpty() ? arguments.at(0) : abortCommand;
VcsCommand *command = createCommand(workingDirectory);
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.
command->addJob({vcsBinary(), arguments}, isRebase ? 0 : vcsTimeoutS());
ConflictHandler::attachToCommand(command, workingDirectory, abortCommand);
ConflictHandler::attachToCommand(command, workingDirectory, abortString);
if (handler) {
const QObject *actualContext = context ? context : this;
connect(command, &VcsCommand::done, actualContext, [command, handler] {
handler(CommandResult(*command));
});
}
if (isRebase)
command->setProgressParser(GitProgressParser());
command->start();
// TODO: Don't return command, take handler arg
return command;
}
bool GitClient::synchronousRevert(const FilePath &workingDirectory, const QString &commit)

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

@@ -121,10 +121,10 @@ public:
Utils::FilePath vcsBinary() const override;
QFuture<unsigned> gitVersion() const;
VcsBase::VcsCommand *vcsExecAbortable(const Utils::FilePath &workingDirectory,
const QStringList &arguments,
bool isRebase = false,
QString abortCommand = {});
void vcsExecAbortable(const Utils::FilePath &workingDirectory, const QStringList &arguments,
bool isRebase = false, const QString &abortCommand = {},
const QObject *context = nullptr,
const VcsBase::CommandHandler &handler = {});
Utils::FilePath findRepositoryForDirectory(const Utils::FilePath &directory) const;
QString findGitDirForRepository(const Utils::FilePath &repositoryDir) const;