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

Git: Added decoration to log and show

Browse Source 
Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2011-09-19 16:13:37 +02:00
committed by Tobias Hunger
parent a323c0d9fb
commit c20bc6abd1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,6 +437,7 @@ GitClient::~GitClient()
} }
const char *GitClient::noColorOption = "--no-color"; const char *GitClient::noColorOption = "--no-color";
const char *GitClient::decorateOption = "--decorate";
QString GitClient::findRepositoryForDirectory(const QString &dir) QString GitClient::findRepositoryForDirectory(const QString &dir)
{ {
@@ -632,7 +633,7 @@ void GitClient::status(const QString &workingDirectory)
Qt::QueuedConnection); Qt::QueuedConnection);
} }
static const char graphLogFormatC[] = "%h %an %s %ci"; static const char graphLogFormatC[] = "%h %d %an %s %ci";
// Create a graphical log. // Create a graphical log.
void GitClient::graphLog(const QString &workingDirectory, const QString & branch) void GitClient::graphLog(const QString &workingDirectory, const QString & branch)
@@ -669,7 +670,8 @@ void GitClient::log(const QString &workingDirectory, const QStringList &fileName
qDebug() << "log" << workingDirectory << fileNames; qDebug() << "log" << workingDirectory << fileNames;
QStringList arguments; QStringList arguments;
arguments << QLatin1String("log") << QLatin1String(noColorOption); arguments << QLatin1String("log") << QLatin1String(noColorOption)
<< QLatin1String(decorateOption);
if (m_settings.logCount > 0) if (m_settings.logCount > 0)
arguments << QLatin1String("-n") << QString::number(m_settings.logCount); arguments << QLatin1String("-n") << QString::number(m_settings.logCount);
@@ -725,6 +727,7 @@ void GitClient::show(const QString &source, const QString &id, const QStringList
QStringList arguments; QStringList arguments;
arguments << QLatin1String("show") << QLatin1String(noColorOption); arguments << QLatin1String("show") << QLatin1String(noColorOption);
arguments << QLatin1String(decorateOption);
arguments.append(userArgs); arguments.append(userArgs);
arguments << id; arguments << id;
@@ -1369,7 +1372,7 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString &
return false; return false;
} }
QStringList args(QLatin1String("show")); QStringList args(QLatin1String("show"));
args << QLatin1String(noColorOption) << id; args << QLatin1String(decorateOption) << QLatin1String(noColorOption) << id;
QByteArray outputText; QByteArray outputText;
QByteArray errorText; QByteArray errorText;
const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText);

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

@@ -228,6 +228,7 @@ public:
static QString msgNoChangedFiles(); static QString msgNoChangedFiles();
static const char *noColorOption; static const char *noColorOption;
static const char *decorateOption;
public slots: public slots:
void show(const QString &source, const QString &id, const QStringList &args = QStringList()); void show(const QString &source, const QString &id, const QStringList &args = QStringList());