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

Git: Replace bool argument with flags

Browse Source 
For a start, it's a single flag. Will be extended.

Also change the default for includeRemotes to false (most callers pass false)

Change-Id: I969f89a06b85a42c134c0232d2947d58fe19ea0d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-01-28 23:32:23 +02:00
committed by Orgad Shaneh
parent 25ddacc238
commit aa6dd83e08
6 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitplugin.cpp
View File

@@ -833,7 +833,7 @@ void GitPlugin::resetRepository()
LogChangeDialog dialog(true, Core::ICore::mainWindow());
ResetItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Undo Changes to %1").arg(QDir::toNativeSeparators(topLevel)));
if (dialog.runDialog(topLevel))
if (dialog.runDialog(topLevel, QString(), LogChangeWidget::IncludeRemotes))
m_gitClient->reset(topLevel, dialog.resetFlag(), dialog.commit());
}
@@ -849,7 +849,7 @@ void GitPlugin::startRebase()
LogChangeDialog dialog(false, Core::ICore::mainWindow());
RebaseItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Interactive Rebase"));
if (!dialog.runDialog(topLevel, QString(), false))
if (!dialog.runDialog(topLevel))
return;
if (m_gitClient->beginStashScope(topLevel, QLatin1String("Rebase-i")))
m_gitClient->interactiveRebase(topLevel, dialog.commit(), false);