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

Git: Add on-demand branches expanding

Browse Source 
Make "branches expanding" on demand and asynchronous.
After "git show" there is clickable text: "Branches: <Expand>" in
description. If user clicks this text then branches for commit is
triggered and done asynchronously.

Task-number: QTCREATORBUG-11293
Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-24 10:53:03 +03:00
committed by Orgad Shaneh
parent 281aa9e0d6
commit d6583f0f47
6 changed files with 148 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/plugins/diffeditor/diffeditorcontroller.cpp
View File

@@ -27,10 +27,13 @@
**
****************************************************************************/
#include "diffeditorconstants.h"
#include "diffeditorcontroller.h"
#include <coreplugin/icore.h>
#include <QStringList>
static const char settingsGroupC[] = "DiffEditor";
static const char contextLineNumbersKeyC[] = "ContextLineNumbers";
static const char ignoreWhitespaceKeyC[] = "IgnoreWhitespace";
@@ -148,7 +151,11 @@ void DiffEditorController::setDescription(const QString &description)
return;
m_description = description;
emit descriptionChanged(description);
// Empty line before headers and commit message
const int emptyLine = m_description.indexOf(QLatin1String("\n\n"));
if (emptyLine != -1)
m_description.insert(emptyLine, QLatin1Char('\n') + QLatin1String(Constants::EXPAND_BRANCHES));
emit descriptionChanged(m_description);
}
void DiffEditorController::setDescriptionEnabled(bool on)
@@ -160,6 +167,44 @@ void DiffEditorController::setDescriptionEnabled(bool on)
emit descriptionEnablementChanged(on);
}
void DiffEditorController::branchesForCommitReceived(const QString &output)
{
const QString branches = prepareBranchesForCommit(output);
m_description.replace(QLatin1String(Constants::EXPAND_BRANCHES), branches);
emit descriptionChanged(m_description);
}
void DiffEditorController::expandBranchesRequested()
{
emit expandBranchesRequested(m_description.mid(7, 8));
}
QString DiffEditorController::prepareBranchesForCommit(const QString &output)
{
QString moreBranches;
QString branches;
QStringList res;
foreach (const QString &branch, output.split(QLatin1Char('\n'))) {
const QString b = branch.mid(2).trimmed();
if (!b.isEmpty())
res << b;
}
const int branchCount = res.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);
res.erase(res.begin() + leave, res.end());
}
if (!res.isEmpty())
branches = (QLatin1String("Branches: ") + res.join(QLatin1String(", ")) + moreBranches);
return branches;
}
void DiffEditorController::setContextLinesNumber(int lines)
{
const int l = qMax(lines, 1);