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

Git: Some cleanup for branches on show

Browse Source 
* Suppress command logging
* If no branches are found, do not add "Branches:" line

Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-29 11:36:37 +03:00
committed by Orgad Shaneh
parent 35fce3c2ad
commit 47b01acd32
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1804,11 +1804,14 @@ void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const
QStringList GitClient::synchronousBranchesForCommit(const QString &workingDirectory, const QString &revision) QStringList GitClient::synchronousBranchesForCommit(const QString &workingDirectory, const QString &revision)
{ {
QByteArray outputData;
QString output; QString output;
QStringList arguments; QStringList arguments;
arguments << QLatin1String(noColorOption) << QLatin1String("-a") arguments << QLatin1String("branch") << QLatin1String(noColorOption)
<< QLatin1String("--contains") << revision; << QLatin1String("-a") << QLatin1String("--contains") << revision;
synchronousBranchCmd(workingDirectory, arguments, &output, 0); fullySynchronousGit(workingDirectory, arguments, &outputData, 0,
VcsBasePlugin::SuppressCommandLogging);
output = commandOutputFromLocal8Bit(outputData);
QStringList res; QStringList res;
foreach (const QString &branch, output.split(QLatin1Char('\n'))) { foreach (const QString &branch, output.split(QLatin1Char('\n'))) {
const QString b = branch.mid(2).trimmed(); const QString b = branch.mid(2).trimmed();
@@ -2577,9 +2580,11 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons
moreBranches = tr(" and %1 more").arg(branchCount - leave); moreBranches = tr(" and %1 more").arg(branchCount - leave);
branches.erase(branches.begin() + leave, branches.end()); branches.erase(branches.begin() + leave, branches.end());
} }
if (!branches.isEmpty()) {
modText.insert(lastHeaderLine, QLatin1String("Branches: ") modText.insert(lastHeaderLine, QLatin1String("Branches: ")
+ branches.join(QLatin1String(", ")) + moreBranches + branches.join(QLatin1String(", ")) + moreBranches
+ QLatin1Char('\n')); + QLatin1Char('\n'));
}
return modText; return modText;
} }