forked from qt-creator/qt-creator
Git: Do not display invalid commit as blame candidate
Change-Id: Ia08775b2e4364f405d223a9b49971ae70c04965a Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
committed by
Tobias Hunger
parent
16a813694f
commit
12a99d476c
@@ -1040,9 +1040,8 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory,
|
||||
QByteArray outputTextData;
|
||||
QByteArray errorText;
|
||||
QStringList arguments;
|
||||
if (parents && (revision == QLatin1String("00000000"))) { // Not Committed Yet
|
||||
parents->clear();
|
||||
parents->append(QLatin1String("HEAD"));
|
||||
if (parents && !isValidRevision(revision)) { // Not Committed Yet
|
||||
*parents = QStringList(QLatin1String("HEAD"));
|
||||
return true;
|
||||
}
|
||||
arguments << QLatin1String("rev-list") << QLatin1String(GitClient::noColorOption)
|
||||
@@ -1450,6 +1449,16 @@ QProcessEnvironment GitClient::processEnvironment() const
|
||||
return environment;
|
||||
}
|
||||
|
||||
bool GitClient::isValidRevision(const QString &revision) const
|
||||
{
|
||||
if (revision.length() < 1)
|
||||
return false;
|
||||
for (int i = 0; i < revision.length(); ++i)
|
||||
if (revision.at(i) != QLatin1Char('0'))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Synchronous git execution using Utils::SynchronousProcess, with
|
||||
// log windows updating.
|
||||
Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &workingDirectory,
|
||||
|
||||
@@ -220,6 +220,8 @@ public:
|
||||
|
||||
QProcessEnvironment processEnvironment() const;
|
||||
|
||||
bool isValidRevision(const QString &revision) const;
|
||||
|
||||
static QString msgNoChangedFiles();
|
||||
|
||||
static const char *noColorOption;
|
||||
|
||||
@@ -250,6 +250,11 @@ QStringList GitEditor::annotationPreviousVersions(const QString &revision) const
|
||||
return revisions;
|
||||
}
|
||||
|
||||
bool GitEditor::isValidRevision(const QString &revision) const
|
||||
{
|
||||
return GitPlugin::instance()->gitClient()->isValidRevision(revision);
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Git
|
||||
|
||||
|
||||
@@ -63,6 +63,7 @@ private:
|
||||
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
|
||||
virtual QString decorateVersion(const QString &revision) const;
|
||||
virtual QStringList annotationPreviousVersions(const QString &revision) const;
|
||||
virtual bool isValidRevision(const QString &revision) const;
|
||||
|
||||
mutable QRegExp m_changeNumberPattern8;
|
||||
mutable QRegExp m_changeNumberPattern40;
|
||||
|
||||
Reference in New Issue
Block a user