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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
This commit is contained in:
Oswald Buddenhagen
2014-03-27 18:20:00 +01:00
parent 187bb36945 0afa004c0b
commit f013c41d05
272 changed files with 8516 additions and 10735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2872,21 +2872,6 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons
modText.insert(lastHeaderLine, QLatin1String("Precedes: ") + precedes + QLatin1Char('\n'));
if (!follows.isEmpty())
modText.insert(lastHeaderLine, QLatin1String("Follows: ") + follows + QLatin1Char('\n'));
QString moreBranches;
QStringList branches = synchronousBranchesForCommit(workingDirectory, commit);
const int branchCount = branches.count();
// If there are more than 20 branches, list first 10 followed by a hint
if (branchCount > 20) {
const int leave = 10;
//: Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" in git show.
moreBranches = QLatin1Char(' ') + tr("and %n more", 0, branchCount - leave);
branches.erase(branches.begin() + leave, branches.end());
}
if (!branches.isEmpty()) {
modText.insert(lastHeaderLine, QLatin1String("Branches: ")
+ branches.join(QLatin1String(", ")) + moreBranches
+ QLatin1Char('\n'));
}
return modText;
}