forked from qt-creator/qt-creator
VCS: Support silent output on runVcs
Change-Id: If737b03f9d090076e9d739189479fb6725ae8856 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
93dd2795ba
commit
b6fb9e3e54
@@ -871,8 +871,12 @@ static SynchronousProcessResponse runVcsFullySynchronously(const QString &workin
|
|||||||
if (!stdOut.isEmpty()) {
|
if (!stdOut.isEmpty()) {
|
||||||
response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut))
|
response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut))
|
||||||
.remove(QLatin1Char('\r'));
|
.remove(QLatin1Char('\r'));
|
||||||
if (flags & VcsBasePlugin::ShowStdOutInLogWindow)
|
if (flags & VcsBasePlugin::ShowStdOutInLogWindow) {
|
||||||
outputWindow->append(response.stdOut);
|
if (flags & VcsBasePlugin::SilentOutput)
|
||||||
|
outputWindow->appendSilently(response.stdOut);
|
||||||
|
else
|
||||||
|
outputWindow->append(response.stdOut);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Result
|
// Result
|
||||||
|
@@ -166,7 +166,8 @@ public:
|
|||||||
ForceCLocale = 0x80, // Force C-locale for commands whose output is parsed.
|
ForceCLocale = 0x80, // Force C-locale for commands whose output is parsed.
|
||||||
FullySynchronously = 0x100, // Suppress local event loop (in case UI actions are
|
FullySynchronously = 0x100, // Suppress local event loop (in case UI actions are
|
||||||
// triggered by file watchers).
|
// 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,
|
static Utils::SynchronousProcessResponse runVcs(const QString &workingDir,
|
||||||
|
Reference in New Issue
Block a user