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

Git: Show Precedes/Follows tags on Show editor

Browse Source 
Known limitation: Commit that has a tag shows its own tag on Precedes
field

Change-Id: I533e48b4bb5d57809d8e9f12fa7db5d8706f7372
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-25 15:22:25 +02:00
committed by Orgad Shaneh
parent 7127b38a1a
commit 6a337561c5
3 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/git/giteditor.cpp
View File

@@ -207,11 +207,32 @@ static QByteArray removeAnnotationDate(const QByteArray &b)
void GitEditor::setPlainTextDataFiltered(const QByteArray &a)
{
QByteArray array = a;
GitPlugin *plugin = GitPlugin::instance();
// If desired, filter out the date from annotation
const bool omitAnnotationDate = contentType() == VcsBase::AnnotateOutput
&& GitPlugin::instance()->settings().boolValue(GitSettings::omitAnnotationDateKey);
if (omitAnnotationDate)
array = removeAnnotationDate(a);
switch (contentType())
{
case VcsBase::AnnotateOutput: {
const bool omitAnnotationDate = plugin->settings().boolValue(GitSettings::omitAnnotationDateKey);
if (omitAnnotationDate)
array = removeAnnotationDate(a);
break;
}
case VcsBase::DiffOutput: {
const QFileInfo fi(source());
const QString workingDirectory = fi.absolutePath();
QByteArray precedes, follows;
if (array.startsWith("commit ")) { // show
int lastHeaderLine = array.indexOf("\n\n") + 1;
plugin->gitClient()->synchronousTagsForCommit(workingDirectory, QLatin1String(array.mid(7, 8)), precedes, follows);
if (!precedes.isEmpty())
array.insert(lastHeaderLine, "Precedes: " + precedes + '\n');
if (!follows.isEmpty())
array.insert(lastHeaderLine, "Follows: " + follows + '\n');
}
break;
}
}
setPlainTextData(array);
}