From c20bc6abd1336d31ebce0390606b958aff056f24 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 19 Sep 2011 16:13:37 +0200 Subject: Git: Added decoration to log and show Merge-request: 385 Reviewed-by: Tobias Hunger Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa Task-number: QTCREATORBUG-5749 Reviewed-on: http://codereview.qt-project.org/5158 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 9 ++++++--- src/plugins/git/gitclient.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/plugins/git') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 234473aad7..30139c1b48 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -437,6 +437,7 @@ GitClient::~GitClient() } const char *GitClient::noColorOption = "--no-color"; +const char *GitClient::decorateOption = "--decorate"; QString GitClient::findRepositoryForDirectory(const QString &dir) { @@ -632,7 +633,7 @@ void GitClient::status(const QString &workingDirectory) Qt::QueuedConnection); } -static const char graphLogFormatC[] = "%h %an %s %ci"; +static const char graphLogFormatC[] = "%h %d %an %s %ci"; // Create a graphical log. 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; QStringList arguments; - arguments << QLatin1String("log") << QLatin1String(noColorOption); + arguments << QLatin1String("log") << QLatin1String(noColorOption) + << QLatin1String(decorateOption); if (m_settings.logCount > 0) 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; arguments << QLatin1String("show") << QLatin1String(noColorOption); + arguments << QLatin1String(decorateOption); arguments.append(userArgs); arguments << id; @@ -1369,7 +1372,7 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString & return false; } QStringList args(QLatin1String("show")); - args << QLatin1String(noColorOption) << id; + args << QLatin1String(decorateOption) << QLatin1String(noColorOption) << id; QByteArray outputText; QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 7af9056276..f20d49e50e 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -228,6 +228,7 @@ public: static QString msgNoChangedFiles(); static const char *noColorOption; + static const char *decorateOption; public slots: void show(const QString &source, const QString &id, const QStringList &args = QStringList()); -- cgit v1.2.1