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

Git: Enable "First Parent" display in log editor

Browse Source 
Shows merge commits instead of recursing into them.

When Diff is enabled, it will be done against the merge commit's parent,
rather than showing conflict resolution.

Change-Id: Iaa3ac622ffde34e58763a968d387041e0ef99b21
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2015-08-09 22:04:10 +03:00
committed by Orgad Shaneh
parent c844071627
commit fd6b3cd484
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,6 +444,11 @@ public:
connect(diffButton, &QAction::toggled, m_ignoreWSButton, &QAction::setVisible); connect(diffButton, &QAction::toggled, m_ignoreWSButton, &QAction::setVisible);
m_patienceButton->setVisible(diffButton->isChecked()); m_patienceButton->setVisible(diffButton->isChecked());
m_ignoreWSButton->setVisible(diffButton->isChecked()); m_ignoreWSButton->setVisible(diffButton->isChecked());
QAction *firstParentButton =
addToggleButton({ "-m", "--first-parent" },
tr("First Parent"),
tr("Follow only the first parent on merge commits."));
mapSetting(firstParentButton, settings.boolPointer(GitSettings::firstParentKey));
const QStringList graphArguments = { const QStringList graphArguments = {
"--graph", "--oneline", "--topo-order", "--graph", "--oneline", "--topo-order",
QLatin1String("--pretty=format:") + graphLogFormatC QLatin1String("--pretty=format:") + graphLogFormatC

2
src/plugins/git/gitsettings.cpp
View File

@@ -44,6 +44,7 @@ const QLatin1String GitSettings::gitkOptionsKey("GitKOptions");
const QLatin1String GitSettings::logDiffKey("LogDiff"); const QLatin1String GitSettings::logDiffKey("LogDiff");
const QLatin1String GitSettings::repositoryBrowserCmd("RepositoryBrowserCmd"); const QLatin1String GitSettings::repositoryBrowserCmd("RepositoryBrowserCmd");
const QLatin1String GitSettings::graphLogKey("GraphLog"); const QLatin1String GitSettings::graphLogKey("GraphLog");
const QLatin1String GitSettings::firstParentKey("FirstParent");
const QLatin1String GitSettings::lastResetIndexKey("LastResetIndex"); const QLatin1String GitSettings::lastResetIndexKey("LastResetIndex");
GitSettings::GitSettings() GitSettings::GitSettings()
@@ -64,6 +65,7 @@ GitSettings::GitSettings()
declareKey(logDiffKey, false); declareKey(logDiffKey, false);
declareKey(repositoryBrowserCmd, QString()); declareKey(repositoryBrowserCmd, QString());
declareKey(graphLogKey, false); declareKey(graphLogKey, false);
declareKey(firstParentKey, false);
declareKey(lastResetIndexKey, 0); declareKey(lastResetIndexKey, 0);
} }

1
src/plugins/git/gitsettings.h
View File

@@ -55,6 +55,7 @@ public:
static const QLatin1String logDiffKey; static const QLatin1String logDiffKey;
static const QLatin1String repositoryBrowserCmd; static const QLatin1String repositoryBrowserCmd;
static const QLatin1String graphLogKey; static const QLatin1String graphLogKey;
static const QLatin1String firstParentKey;
static const QLatin1String lastResetIndexKey; static const QLatin1String lastResetIndexKey;
Utils::FileName gitExecutable(bool *ok = 0, QString *errorMessage = 0) const; Utils::FileName gitExecutable(bool *ok = 0, QString *errorMessage = 0) const;