From 3b5c40ba4738a9f2997a7f4bd75d38070147335e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Sun, 1 Jul 2012 13:58:39 +0300
Subject: [PATCH] Git: Cleanup
* Remove unused 'silent' argument
* Do not output 'git --version' command
Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
src/plugins/git/gitclient.cpp | 34 +++++++--------------------
src/plugins/git/gitclient.h | 5 ++--
src/plugins/git/gitversioncontrol.cpp | 4 ++--
3 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 89cb166b13e..1d25a002631 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -366,7 +366,7 @@ const char *GitClient::decorateOption = "--decorate";
QString GitClient::findRepositoryForDirectory(const QString &dir)
{
- if (gitVersion(true) >= 0x010700) {
+ if (gitVersion() >= 0x010700) {
// Find a directory to run git in:
const QString root = QDir::rootPath();
const QString home = QDir::homePath();
@@ -1752,7 +1752,7 @@ bool GitClient::getCommitData(const QString &workingDirectory,
if (amend) {
// Amend: get last commit data as "SHA1<tab>author<tab>email<tab>message".
QStringList args(QLatin1String("log"));
- const QString msgFormat = QLatin1String((gitVersion(true) > 0x010701) ? "%B" : "%s%n%n%b");
+ const QString msgFormat = QLatin1String((gitVersion() > 0x010701) ? "%B" : "%s%n%n%b");
const QString format = QLatin1String("%h\t%an\t%ae\t") + msgFormat;
args << QLatin1String("--max-count=1") << QLatin1String("--pretty=format:") + format;
QTextCodec *codec = QTextCodec::codecForName(commitData->commitEncoding.toLocal8Bit());
@@ -2317,31 +2317,20 @@ void GitClient::connectRepositoryChanged(const QString & repository, VcsBase::Co
}
// determine version as '(major << 16) + (minor << 8) + patch' or 0.
-unsigned GitClient::gitVersion(bool silent, QString *errorMessage) const
+unsigned GitClient::gitVersion(QString *errorMessage) const
{
const QString newGitBinary = gitBinaryPath();
if (m_gitVersionForBinary != newGitBinary && !newGitBinary.isEmpty()) {
// Do not execute repeatedly if that fails (due to git
// not being installed) until settings are changed.
- m_cachedGitVersion = synchronousGitVersion(silent, errorMessage);
+ m_cachedGitVersion = synchronousGitVersion(errorMessage);
m_gitVersionForBinary = newGitBinary;
}
return m_cachedGitVersion;
}
-QString GitClient::gitVersionString(bool silent, QString *errorMessage) const
-{
- if (const unsigned version = gitVersion(silent, errorMessage)) {
- QString rc;
- QTextStream(&rc) << (version >> 16) << '.'
- << (0xFF & (version >> 8)) << '.'
- << (version & 0xFF);
- return rc;
- }
- return QString();
-}
// determine version as '(major << 16) + (minor << 8) + patch' or 0.
-unsigned GitClient::synchronousGitVersion(bool silent, QString *errorMessage) const
+unsigned GitClient::synchronousGitVersion(QString *errorMessage) const
{
if (gitBinaryPath().isEmpty())
return 0;
@@ -2349,18 +2338,13 @@ unsigned GitClient::synchronousGitVersion(bool silent, QString *errorMessage) co
// run git --version
QByteArray outputText;
QByteArray errorText;
- const bool rc = fullySynchronousGit(QString(), QStringList(QLatin1String("--version")), &outputText, &errorText);
+ const bool rc = fullySynchronousGit(QString(), QStringList(QLatin1String("--version")), &outputText, &errorText, false);
if (!rc) {
const QString msg = tr("Cannot determine git version: %1").arg(commandOutputFromLocal8Bit(errorText));
- if (errorMessage) {
+ if (errorMessage)
*errorMessage = msg;
- } else {
- if (silent) {
- outputWindow()->append(msg);
- } else {
- outputWindow()->appendError(msg);
- }
- }
+ else
+ outputWindow()->append(msg);
return 0;
}
// cut 'git version 1.6.5.1.sha'
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 48986ec7613..39136116ae1 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -84,8 +84,7 @@ public:
~GitClient();
QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
- unsigned gitVersion(bool silent, QString *errorMessage = 0) const;
- QString gitVersionString(bool silent, QString *errorMessage = 0) const;
+ unsigned gitVersion(QString *errorMessage = 0) const;
QString findRepositoryForDirectory(const QString &dir);
@@ -277,7 +276,7 @@ private:
unsigned flags = 0, QTextCodec *outputCodec = 0);
// determine version as '(major << 16) + (minor << 8) + patch' or 0.
- unsigned synchronousGitVersion(bool silent, QString *errorMessage = 0) const;
+ unsigned synchronousGitVersion(QString *errorMessage = 0) const;
enum RevertResult { RevertOk, RevertUnchanged, RevertCanceled, RevertFailed };
RevertResult revertI(QStringList files,
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index 65f7e90f54d..5e8406447a8 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -77,7 +77,7 @@ bool GitVersionControl::supportsOperation(Operation operation) const
bool rc = false;
switch (operation) {
case AddOperation:
- rc = m_client->gitVersion(true) >= version(1, 6, 1);;
+ rc = m_client->gitVersion() >= version(1, 6, 1);;
break;
case DeleteOperation:
rc = true;
@@ -110,7 +110,7 @@ bool GitVersionControl::vcsOpen(const QString & /*fileName*/)
bool GitVersionControl::vcsAdd(const QString & fileName)
{
// Implement in terms of using "--intent-to-add"
- QTC_ASSERT(m_client->gitVersion(true) >= version(1, 6, 1), return false);
+ QTC_ASSERT(m_client->gitVersion() >= version(1, 6, 1), return false);
const QFileInfo fi(fileName);
return m_client->synchronousAdd(fi.absolutePath(), true, QStringList(fi.fileName()));
}
--
GitLab