From e922cd234b4452906bf711938b6e6fd67d80b069 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 6 Dec 2013 14:56:24 +0100 Subject: Bzr: add support for "uncommit" command All "bzr uncommit" options are supported, even --dry-run (allowing user to check the green light) Change-Id: Ib97ef1333709ad18be53c658c23c97356e4e4ce0 Reviewed-by: Leena Miettinen Reviewed-by: Tobias Hunger --- src/plugins/bazaar/bazaarplugin.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/plugins/bazaar/bazaarplugin.cpp') diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 47045f8eb6..1ca6863a85 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -34,6 +34,7 @@ #include "bazaarcommitwidget.h" #include "bazaareditor.h" #include "pullorpushdialog.h" +#include "uncommitdialog.h" #include "commiteditor.h" #include "clonewizard.h" @@ -421,6 +422,13 @@ void BazaarPlugin::createRepositoryActions(const Core::Context &context) m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); + action = new QAction(tr("Uncommit..."), this); + m_repositoryActionList.append(action); + command = Core::ActionManager::registerAction(action, Core::Id(Constants::UNCOMMIT), context); + connect(action, SIGNAL(triggered()), this, SLOT(uncommit())); + m_bazaarContainer->addAction(command); + m_commandLocator->appendCommand(command); + QAction *createRepositoryAction = new QAction(tr("Create Repository..."), this); command = Core::ActionManager::registerAction(createRepositoryAction, Core::Id(Constants::CREATE_REPOSITORY), context); connect(createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository())); @@ -640,6 +648,16 @@ void BazaarPlugin::commitFromEditor() Core::EditorManager::closeEditor(); } +void BazaarPlugin::uncommit() +{ + const VcsBase::VcsBasePluginState state = currentState(); + QTC_ASSERT(state.hasTopLevel(), return); + + UnCommitDialog dialog; + if (dialog.exec() == QDialog::Accepted) + m_client->synchronousUncommit(state.topLevel(), dialog.revision(), dialog.extraOptions()); +} + bool BazaarPlugin::submitEditorAboutToClose() { CommitEditor *commitEditor = qobject_cast(submitEditor()); -- cgit v1.2.1