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

Git: Suppress log output in LogChangeWidget

Browse Source 
It's distracting

Change-Id: I6c522ee61ba7261611002bf40c01a9d1d23a0259
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-12 10:09:55 +02:00
committed by Orgad Shaneh
parent dafaab25bd
commit b7d2268ff3
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1649,14 +1649,15 @@ void GitClient::addFile(const QString &workingDirectory, const QString &fileName
} }
bool GitClient::synchronousLog(const QString &workingDirectory, const QStringList &arguments, bool GitClient::synchronousLog(const QString &workingDirectory, const QStringList &arguments,
QString *output, QString *errorMessageIn) QString *output, QString *errorMessageIn, unsigned flags)
{ {
QByteArray outputText; QByteArray outputText;
QByteArray errorText; QByteArray errorText;
QStringList allArguments; QStringList allArguments;
allArguments << QLatin1String("log") << QLatin1String(noColorOption); allArguments << QLatin1String("log") << QLatin1String(noColorOption);
allArguments.append(arguments); allArguments.append(arguments);
const bool rc = fullySynchronousGit(workingDirectory, allArguments, &outputText, &errorText); const bool rc = fullySynchronousGit(workingDirectory, allArguments, &outputText, &errorText,
flags);
if (rc) { if (rc) {
QString encodingName = readConfigValue(workingDirectory, QLatin1String("i18n.logOutputEncoding")); QString encodingName = readConfigValue(workingDirectory, QLatin1String("i18n.logOutputEncoding"));
if (encodingName.isEmpty()) if (encodingName.isEmpty())

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

@@ -157,7 +157,9 @@ public:
void addFile(const QString &workingDirectory, const QString &fileName); void addFile(const QString &workingDirectory, const QString &fileName);
bool synchronousLog(const QString &workingDirectory, bool synchronousLog(const QString &workingDirectory,
const QStringList &arguments, const QStringList &arguments,
QString *output, QString *errorMessage = 0); QString *output,
QString *errorMessage = 0,
unsigned flags = 0);
bool synchronousAdd(const QString &workingDirectory, const QStringList &files); bool synchronousAdd(const QString &workingDirectory, const QStringList &files);
bool synchronousDelete(const QString &workingDirectory, bool synchronousDelete(const QString &workingDirectory,
bool force, bool force,

7
src/plugins/git/logchangedialog.cpp
View File

@@ -32,6 +32,7 @@
#include "gitclient.h" #include "gitclient.h"
#include <vcsbase/vcsbaseoutputwindow.h> #include <vcsbase/vcsbaseoutputwindow.h>
#include <vcsbase/vcsbaseplugin.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -45,6 +46,8 @@
#include <QComboBox> #include <QComboBox>
#include <QPainter> #include <QPainter>
using namespace VcsBase;
namespace Git { namespace Git {
namespace Internal { namespace Internal {
@@ -76,7 +79,7 @@ bool LogChangeWidget::init(const QString &repository, const QString &commit, Log
if (!populateLog(repository, commit, flags)) if (!populateLog(repository, commit, flags))
return false; return false;
if (!m_model->rowCount()) { if (!m_model->rowCount()) {
VcsBase::VcsBaseOutputWindow::instance()->appendError( VcsBaseOutputWindow::instance()->appendError(
GitPlugin::instance()->gitClient()->msgNoCommits(flags & IncludeRemotes)); GitPlugin::instance()->gitClient()->msgNoCommits(flags & IncludeRemotes));
return false; return false;
} }
@@ -158,7 +161,7 @@ bool LogChangeWidget::populateLog(const QString &repository, const QString &comm
if (!(flags & IncludeRemotes)) if (!(flags & IncludeRemotes))
arguments << QLatin1String("--not") << QLatin1String("--remotes"); arguments << QLatin1String("--not") << QLatin1String("--remotes");
QString output; QString output;
if (!client->synchronousLog(repository, arguments, &output)) if (!client->synchronousLog(repository, arguments, &output, 0, VcsBasePlugin::NoOutput))
return false; return false;
foreach (const QString &line, output.split(QLatin1Char('\n'))) { foreach (const QString &line, output.split(QLatin1Char('\n'))) {
const int colonPos = line.indexOf(QLatin1Char(':')); const int colonPos = line.indexOf(QLatin1Char(':'));