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

VCS: Support silent output on runVcs

Browse Source 
Change-Id: If737b03f9d090076e9d739189479fb6725ae8856
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-17 22:27:35 +03:00
committed by Orgad Shaneh
parent 93dd2795ba
commit b6fb9e3e54
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/vcsbase/vcsbaseplugin.cpp
+6 -2
View File
@@ -871,8 +871,12 @@ static SynchronousProcessResponse runVcsFullySynchronously(const QString &workin
if (!stdOut.isEmpty()) {
response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut))
.remove(QLatin1Char('\r'));
if (flags & VcsBasePlugin::ShowStdOutInLogWindow)
outputWindow->append(response.stdOut);
if (flags & VcsBasePlugin::ShowStdOutInLogWindow) {
if (flags & VcsBasePlugin::SilentOutput)
outputWindow->appendSilently(response.stdOut);
else
outputWindow->append(response.stdOut);
}
}
// Result
src/plugins/vcsbase/vcsbaseplugin.h
+2 -1
View File
@@ -166,7 +166,8 @@ public:
ForceCLocale = 0x80, // Force C-locale for commands whose output is parsed.
FullySynchronously = 0x100, // Suppress local event loop (in case UI actions are
// triggered by file watchers).
ExpectRepoChanges = 0x200 // Expect changes in repository by the command
ExpectRepoChanges = 0x200, // Expect changes in repository by the command
SilentOutput = 0x400 // With ShowStdOutInLogWindow - append output silently
};
static Utils::SynchronousProcessResponse runVcs(const QString &workingDir,