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

Git: WS fix

Browse Source 
Change-Id: I0b4d37ae8ccd5f5edd8f049d31519be7d2131036
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-04-10 14:52:30 +02:00
parent 68045c1d0d
commit 0f5fdbe0f2
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1968,12 +1968,9 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory,
} }
// Execute a single command // Execute a single command
VcsCommand *GitClient::executeGit(const QString &workingDirectory, VcsCommand *GitClient::executeGit(const QString &workingDirectory, const QStringList &arguments,
const QStringList &arguments, VcsBaseEditorWidget *editor, bool useOutputToWindow,
VcsBaseEditorWidget* editor, unsigned additionalFlags, int editorLineNumber)
bool useOutputToWindow,
unsigned additionalFlags,
int editorLineNumber)
{ {
VcsOutputWindow::appendCommand(workingDirectory, vcsBinary(), arguments); VcsOutputWindow::appendCommand(workingDirectory, vcsBinary(), arguments);
VcsCommand *command = createCommand(workingDirectory, editor, VcsCommand *command = createCommand(workingDirectory, editor,
@@ -2048,8 +2045,8 @@ SynchronousProcessResponse GitClient::synchronousGit(const QString &workingDirec
bool GitClient::fullySynchronousGit(const QString &workingDirectory, bool GitClient::fullySynchronousGit(const QString &workingDirectory,
const QStringList &gitArguments, const QStringList &gitArguments,
QByteArray* outputText, QByteArray *outputText,
QByteArray* errorText, QByteArray *errorText,
unsigned flags) const unsigned flags) const
{ {
VcsCommand command(vcsBinary(), workingDirectory, processEnvironment()); VcsCommand command(vcsBinary(), workingDirectory, processEnvironment());

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

@@ -376,18 +376,16 @@ private:
void requestReload(const QString &documentId, const QString &source, const QString &title, void requestReload(const QString &documentId, const QString &source, const QString &title,
std::function<DiffEditor::DiffEditorController *(Core::IDocument *)> factory) const; std::function<DiffEditor::DiffEditorController *(Core::IDocument *)> factory) const;
VcsBase::VcsCommand *executeGit(const QString &workingDirectory, VcsBase::VcsCommand *executeGit(const QString &workingDirectory, const QStringList &arguments,
const QStringList &arguments, VcsBase::VcsBaseEditorWidget *editor = 0,
VcsBase::VcsBaseEditorWidget* editor = 0, bool useOutputToWindow = false, unsigned additionalFlags = 0,
bool useOutputToWindow = false, int editorLineNumber = -1);
unsigned additionalFlags = 0,
int editorLineNumber = -1);
// Fully synchronous git execution (QProcess-based). // Fully synchronous git execution (QProcess-based).
bool fullySynchronousGit(const QString &workingDirectory, bool fullySynchronousGit(const QString &workingDirectory,
const QStringList &arguments, const QStringList &arguments,
QByteArray* outputText, QByteArray *outputText,
QByteArray* errorText = 0, QByteArray *errorText = 0,
unsigned flags = 0) const; unsigned flags = 0) const;
// Synchronous git execution using Utils::SynchronousProcess, with // Synchronous git execution using Utils::SynchronousProcess, with