Commit dd7c2e62 authored by Petar Perisin's avatar Petar Perisin
Browse files

Git - refactor executeGit and remove unnecessary args



Change-Id: Idf770a20db66191b4d7fe3a704d31bdce70505c5
Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 80a71076
......@@ -1245,7 +1245,7 @@ void GitClient::blame(const QString &workingDirectory,
arguments << QLatin1String("--") << fileName;
if (!revision.isEmpty())
arguments << revision;
executeGit(workingDirectory, arguments, editor, false, VcsBase::Command::NoReport, lineNumber);
executeGit(workingDirectory, arguments, editor, false, lineNumber);
}
bool GitClient::synchronousCheckout(const QString &workingDirectory,
......@@ -2130,15 +2130,13 @@ VcsBase::Command *GitClient::executeGit(const QString &workingDirectory,
const QStringList &arguments,
VcsBase::VcsBaseEditorWidget* editor,
bool useOutputToWindow,
VcsBase::Command::TerminationReportMode tm,
int editorLineNumber,
bool unixTerminalDisabled)
int editorLineNumber)
{
outputWindow()->appendCommand(workingDirectory, settings()->stringValue(GitSettings::binaryPathKey), arguments);
VcsBase::Command *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber);
command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey));
command->setTerminationReportMode(tm);
command->setUnixTerminalDisabled(unixTerminalDisabled);
command->setTerminationReportMode(VcsBase::Command::NoReport);
command->setUnixTerminalDisabled(false);
command->execute();
return command;
}
......
......@@ -356,9 +356,7 @@ private:
const QStringList &arguments,
VcsBase::VcsBaseEditorWidget* editor = 0,
bool useOutputToWindow = false,
VcsBase::Command::TerminationReportMode tm = VcsBase::Command::NoReport,
int editorLineNumber = -1,
bool unixTerminalDisabled = false);
int editorLineNumber = -1);
// Fully synchronous git execution (QProcess-based).
bool fullySynchronousGit(const QString &workingDirectory,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment