/************************************************************************** ** ** Copyright (C) 2015 Brian McGillion ** Contact: http://www.qt.io/licensing ** ** This file is part of Qt Creator. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms and ** conditions see http://www.qt.io/terms-conditions. For further information ** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 or version 3 as published by the Free ** Software Foundation and appearing in the file LICENSE.LGPLv21 and ** LICENSE.LGPLv3 included in the packaging of this file. Please review the ** following information to ensure the GNU Lesser General Public License ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, The Qt Company gives you certain additional ** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ #include "mercurialplugin.h" #include "optionspage.h" #include "constants.h" #include "mercurialclient.h" #include "mercurialcontrol.h" #include "mercurialeditor.h" #include "revertdialog.h" #include "srcdestdialog.h" #include "commiteditor.h" #include "clonewizard.h" #include "mercurialsettings.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #ifdef WITH_TESTS #include #endif using namespace VcsBase; using namespace Utils; namespace Mercurial { namespace Internal { static const VcsBaseEditorParameters editorParameters[] = { { LogOutput, Constants::FILELOG_ID, Constants::FILELOG_DISPLAY_NAME, Constants::LOGAPP}, { AnnotateOutput, Constants::ANNOTATELOG_ID, Constants::ANNOTATELOG_DISPLAY_NAME, Constants::ANNOTATEAPP}, { DiffOutput, Constants::DIFFLOG_ID, Constants::DIFFLOG_DISPLAY_NAME, Constants::DIFFAPP} }; static const VcsBaseSubmitEditorParameters submitEditorParameters = { Constants::COMMITMIMETYPE, Constants::COMMIT_ID, Constants::COMMIT_DISPLAY_NAME, VcsBaseSubmitEditorParameters::DiffFiles }; MercurialPlugin *MercurialPlugin::m_instance = 0; MercurialPlugin::MercurialPlugin() : optionsPage(0), m_client(0), core(0), m_commandLocator(0), m_addAction(0), m_deleteAction(0), m_createRepositoryAction(0), m_menuAction(0), m_submitActionTriggered(false) { m_instance = this; } MercurialPlugin::~MercurialPlugin() { if (m_client) { delete m_client; m_client = 0; } m_instance = 0; } bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * /*errorMessage */) { Core::Context context(Constants::MERCURIAL_CONTEXT); m_client = new MercurialClient(&mercurialSettings); initializeVcs(new MercurialControl(m_client), context); optionsPage = new OptionsPage(); addAutoReleasedObject(optionsPage); mercurialSettings.readSettings(core->settings()); connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant))); connect(m_client, SIGNAL(needUpdate()), this, SLOT(update())); static const char *describeSlot = SLOT(view(QString,QString)); const int editorCount = sizeof(editorParameters)/sizeof(editorParameters[0]); const auto widgetCreator = []() { return new MercurialEditorWidget; }; for (int i = 0; i < editorCount; i++) addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, m_client, describeSlot)); addAutoReleasedObject(new VcsSubmitEditorFactory(&submitEditorParameters, []() { return new CommitEditor(&submitEditorParameters); })); auto cloneWizardFactory = new BaseCheckoutWizardFactory; cloneWizardFactory->setId(QLatin1String(VcsBase::Constants::VCS_ID_MERCURIAL)); cloneWizardFactory->setIcon(QIcon(QLatin1String(":/mercurial/images/hg.png"))); cloneWizardFactory->setDescription(tr("Clones a Mercurial repository and tries to load the contained project.")); cloneWizardFactory->setDisplayName(tr("Mercurial Clone")); cloneWizardFactory->setWizardCreator([this] (const FileName &path, QWidget *parent) { return new CloneWizard(path, parent); }); addAutoReleasedObject(cloneWizardFactory); const QString prefix = QLatin1String("hg"); m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix); addAutoReleasedObject(m_commandLocator); createMenu(context); createSubmitEditorActions(); return true; } const MercurialSettings &MercurialPlugin::settings() { return m_instance->mercurialSettings; } void MercurialPlugin::setSettings(const MercurialSettings &settings) { if (settings != m_instance->mercurialSettings) { m_instance->mercurialSettings = settings; static_cast(m_instance->versionControl())->emitConfigurationChanged(); } } void MercurialPlugin::createMenu(const Core::Context &context) { // Create menu item for Mercurial m_mercurialContainer = Core::ActionManager::createMenu("Mercurial.MercurialMenu"); QMenu *menu = m_mercurialContainer->menu(); menu->setTitle(tr("Me&rcurial")); createFileActions(context); m_mercurialContainer->addSeparator(context); createDirectoryActions(context); m_mercurialContainer->addSeparator(context); createRepositoryActions(context); m_mercurialContainer->addSeparator(context); createRepositoryManagementActions(context); // Request the Tools menu and add the Mercurial menu to it Core::ActionContainer *toolsMenu = Core::ActionManager::actionContainer(Core::Id(Core::Constants::M_TOOLS)); toolsMenu->addMenu(m_mercurialContainer); m_menuAction = m_mercurialContainer->menu()->menuAction(); } void MercurialPlugin::createFileActions(const Core::Context &context) { Core::Command *command; annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(annotateFile, Core::Id(Constants::ANNOTATE), context); command->setAttribute(Core::Command::CA_UpdateText); connect(annotateFile, SIGNAL(triggered()), this, SLOT(annotateCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(diffFile, Core::Id(Constants::DIFF), context); command->setAttribute(Core::Command::CA_UpdateText); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+D") : tr("Alt+G,Alt+D"))); connect(diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(logFile, Core::Id(Constants::LOG), context); command->setAttribute(Core::Command::CA_UpdateText); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+L") : tr("Alt+G,Alt+L"))); connect(logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(statusFile, Core::Id(Constants::STATUS), context); command->setAttribute(Core::Command::CA_UpdateText); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+S") : tr("Alt+G,Alt+S"))); connect(statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); m_mercurialContainer->addSeparator(context); m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_addAction, Core::Id(Constants::ADD), context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_deleteAction, Core::Id(Constants::DELETE), context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(revertFile, Core::Id(Constants::REVERT), context); command->setAttribute(Core::Command::CA_UpdateText); connect(revertFile, SIGNAL(triggered()), this, SLOT(revertCurrentFile())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); } void MercurialPlugin::addCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile()); } void MercurialPlugin::annotateCurrentFile() { int currentLine = -1; if (Core::IEditor *editor = Core::EditorManager::currentEditor()) currentLine = editor->currentLine(); const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); m_client->annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), QString(), currentLine); } void MercurialPlugin::diffCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); } void MercurialPlugin::logCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), QStringList(), true); } void MercurialPlugin::revertCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); RevertDialog reverter(Core::ICore::dialogParent()); if (reverter.exec() != QDialog::Accepted) return; m_client->revertFile(state.currentFileTopLevel(), state.relativeCurrentFile(), reverter.revision()); } void MercurialPlugin::statusCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); m_client->status(state.currentFileTopLevel(), state.relativeCurrentFile()); } void MercurialPlugin::createDirectoryActions(const Core::Context &context) { QAction *action; Core::Command *command; action = new QAction(tr("Diff"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::DIFFMULTI), context); connect(action, SIGNAL(triggered()), this, SLOT(diffRepository())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Log"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::LOGMULTI), context); connect(action, SIGNAL(triggered()), this, SLOT(logRepository())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Revert..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::REVERTMULTI), context); connect(action, SIGNAL(triggered()), this, SLOT(revertMulti())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Status"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::STATUSMULTI), context); connect(action, SIGNAL(triggered()), this, SLOT(statusMulti())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); } void MercurialPlugin::diffRepository() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); m_client->diff(state.topLevel()); } void MercurialPlugin::logRepository() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); m_client->log(state.topLevel()); } void MercurialPlugin::revertMulti() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); RevertDialog reverter(Core::ICore::dialogParent()); if (reverter.exec() != QDialog::Accepted) return; m_client->revertAll(state.topLevel(), reverter.revision()); } void MercurialPlugin::statusMulti() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); m_client->status(state.topLevel()); } void MercurialPlugin::createRepositoryActions(const Core::Context &context) { QAction *action = new QAction(tr("Pull..."), this); m_repositoryActionList.append(action); Core::Command *command = Core::ActionManager::registerAction(action, Core::Id(Constants::PULL), context); connect(action, SIGNAL(triggered()), this, SLOT(pull())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Push..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::PUSH), context); connect(action, SIGNAL(triggered()), this, SLOT(push())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Update..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::UPDATE), context); connect(action, SIGNAL(triggered()), this, SLOT(update())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Import..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::IMPORT), context); connect(action, SIGNAL(triggered()), this, SLOT(import())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Incoming..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::INCOMING), context); connect(action, SIGNAL(triggered()), this, SLOT(incoming())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Outgoing..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::OUTGOING), context); connect(action, SIGNAL(triggered()), this, SLOT(outgoing())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); action = new QAction(tr("Commit..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Core::Id(Constants::COMMIT), context); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+C") : tr("Alt+G,Alt+C"))); connect(action, SIGNAL(triggered()), this, SLOT(commit())); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); m_createRepositoryAction = new QAction(tr("Create Repository..."), this); command = Core::ActionManager::registerAction(m_createRepositoryAction, Core::Id(Constants::CREATE_REPOSITORY), context); connect(m_createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository())); m_mercurialContainer->addAction(command); } void MercurialPlugin::pull() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); SrcDestDialog dialog(SrcDestDialog::incoming, Core::ICore::dialogParent()); dialog.setWindowTitle(tr("Pull Source")); if (dialog.exec() != QDialog::Accepted) return; m_client->synchronousPull(dialog.workingDir(), dialog.getRepositoryString()); } void MercurialPlugin::push() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); SrcDestDialog dialog(SrcDestDialog::outgoing, Core::ICore::dialogParent()); dialog.setWindowTitle(tr("Push Destination")); if (dialog.exec() != QDialog::Accepted) return; m_client->synchronousPush(dialog.workingDir(), dialog.getRepositoryString()); } void MercurialPlugin::update() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); RevertDialog updateDialog(Core::ICore::dialogParent()); updateDialog.setWindowTitle(tr("Update")); if (updateDialog.exec() != QDialog::Accepted) return; m_client->update(state.topLevel(), updateDialog.revision()); } void MercurialPlugin::import() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); QFileDialog importDialog(Core::ICore::dialogParent()); importDialog.setFileMode(QFileDialog::ExistingFiles); importDialog.setViewMode(QFileDialog::Detail); if (importDialog.exec() != QDialog::Accepted) return; const QStringList fileNames = importDialog.selectedFiles(); m_client->import(state.topLevel(), fileNames); } void MercurialPlugin::incoming() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); SrcDestDialog dialog(SrcDestDialog::incoming, Core::ICore::dialogParent()); dialog.setWindowTitle(tr("Incoming Source")); if (dialog.exec() != QDialog::Accepted) return; m_client->incoming(state.topLevel(), dialog.getRepositoryString()); } void MercurialPlugin::outgoing() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); m_client->outgoing(state.topLevel()); } void MercurialPlugin::createSubmitEditorActions() { Core::Context context(Constants::COMMIT_ID); Core::Command *command; editorCommit = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this); command = Core::ActionManager::registerAction(editorCommit, Core::Id(Constants::COMMIT), context); command->setAttribute(Core::Command::CA_UpdateText); connect(editorCommit, SIGNAL(triggered()), this, SLOT(commitFromEditor())); editorDiff = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this); command = Core::ActionManager::registerAction(editorDiff, Core::Id(Constants::DIFFEDITOR), context); editorUndo = new QAction(tr("&Undo"), this); command = Core::ActionManager::registerAction(editorUndo, Core::Id(Core::Constants::UNDO), context); editorRedo = new QAction(tr("&Redo"), this); command = Core::ActionManager::registerAction(editorRedo, Core::Id(Core::Constants::REDO), context); } void MercurialPlugin::commit() { if (raiseSubmitEditor()) return; const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); m_submitRepository = state.topLevel(); connect(m_client, &MercurialClient::parsedStatus, this, &MercurialPlugin::showCommitWidget); m_client->emitParsedStatus(m_submitRepository); } void MercurialPlugin::showCommitWidget(const QList &status) { //Once we receive our data release the connection so it can be reused elsewhere disconnect(m_client, &MercurialClient::parsedStatus, this, &MercurialPlugin::showCommitWidget); if (status.isEmpty()) { VcsOutputWindow::appendError(tr("There are no changes to commit.")); return; } // Start new temp file Utils::TempFileSaver saver; // Keep the file alive, else it removes self and forgets its name saver.setAutoRemove(false); if (!saver.finalize()) { VcsOutputWindow::appendError(saver.errorString()); return; } Core::IEditor *editor = Core::EditorManager::openEditor(saver.fileName(), Constants::COMMIT_ID); if (!editor) { VcsOutputWindow::appendError(tr("Unable to create an editor for the commit.")); return; } QTC_ASSERT(qobject_cast(editor), return); CommitEditor *commitEditor = static_cast(editor); setSubmitEditor(commitEditor); commitEditor->registerActions(editorUndo, editorRedo, editorCommit, editorDiff); connect(commitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffFromEditorSelected(QStringList))); commitEditor->setCheckScriptWorkingDirectory(m_submitRepository); const QString msg = tr("Commit changes for \"%1\"."). arg(QDir::toNativeSeparators(m_submitRepository)); commitEditor->document()->setDisplayName(msg); QString branch = versionControl()->vcsTopic(m_submitRepository); commitEditor->setFields(m_submitRepository, branch, mercurialSettings.stringValue(MercurialSettings::userNameKey), mercurialSettings.stringValue(MercurialSettings::userEmailKey), status); } void MercurialPlugin::diffFromEditorSelected(const QStringList &files) { m_client->diff(m_submitRepository, files); } void MercurialPlugin::commitFromEditor() { // Close the submit editor m_submitActionTriggered = true; QTC_ASSERT(submitEditor(), return); Core::EditorManager::closeDocument(submitEditor()->document()); } bool MercurialPlugin::submitEditorAboutToClose() { CommitEditor *commitEditor = qobject_cast(submitEditor()); QTC_ASSERT(commitEditor, return true); Core::IDocument *editorFile = commitEditor->document(); QTC_ASSERT(editorFile, return true); bool dummyPrompt = false; const VcsBaseSubmitEditor::PromptSubmitResult response = commitEditor->promptSubmit(tr("Close Commit Editor"), tr("Do you want to commit the changes?"), tr("Message check failed. Do you want to proceed?"), &dummyPrompt, !m_submitActionTriggered); m_submitActionTriggered = false; switch (response) { case VcsBaseSubmitEditor::SubmitCanceled: return false; case VcsBaseSubmitEditor::SubmitDiscarded: return true; default: break; } const QStringList files = commitEditor->checkedFiles(); if (!files.empty()) { //save the commit message if (!Core::DocumentManager::saveDocument(editorFile)) return false; QStringList extraOptions; if (!commitEditor->committerInfo().isEmpty()) extraOptions << QLatin1String("-u") << commitEditor->committerInfo(); m_client->commit(m_submitRepository, files, editorFile->filePath(), extraOptions); } return true; } void MercurialPlugin::createRepositoryManagementActions(const Core::Context &context) { //TODO create menu for these options Q_UNUSED(context); return; // QAction *action = new QAction(tr("Branch"), this); // actionList.append(action); // Core::Command *command = Core::ActionManager::registerAction(action, Constants::BRANCH, context); // // connect(action, SIGNAL(triggered()), this, SLOT(branch())); // m_mercurialContainer->addAction(command); } void MercurialPlugin::updateActions(VcsBasePlugin::ActionState as) { if (!enableMenuAction(as, m_menuAction)) { m_commandLocator->setEnabled(false); return; } const QString filename = currentState().currentFileName(); const bool repoEnabled = currentState().hasTopLevel(); m_commandLocator->setEnabled(repoEnabled); annotateFile->setParameter(filename); diffFile->setParameter(filename); logFile->setParameter(filename); m_addAction->setParameter(filename); m_deleteAction->setParameter(filename); revertFile->setParameter(filename); statusFile->setParameter(filename); foreach (QAction *repoAction, m_repositoryActionList) repoAction->setEnabled(repoEnabled); } #ifdef WITH_TESTS void MercurialPlugin::testDiffFileResolving_data() { QTest::addColumn("header"); QTest::addColumn("fileName"); QTest::newRow("New") << QByteArray( "diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp\n" "new file mode 100644\n" "--- /dev/null\n" "+++ b/src/plugins/mercurial/mercurialeditor.cpp\n" "@@ -0,0 +1,112 @@\n\n") << QByteArray("src/plugins/mercurial/mercurialeditor.cpp"); QTest::newRow("Deleted") << QByteArray( "diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp\n" "deleted file mode 100644\n" "--- a/src/plugins/mercurial/mercurialeditor.cpp\n" "+++ /dev/null\n" "@@ -1,112 +0,0 @@\n\n") << QByteArray("src/plugins/mercurial/mercurialeditor.cpp"); QTest::newRow("Normal") << QByteArray( "diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp\n" "--- a/src/plugins/mercurial/mercurialeditor.cpp\n" "+++ b/src/plugins/mercurial/mercurialeditor.cpp\n" "@@ -49,6 +49,8 @@\n\n") << QByteArray("src/plugins/mercurial/mercurialeditor.cpp"); } void MercurialPlugin::testDiffFileResolving() { VcsBaseEditorWidget::testDiffFileResolving(editorParameters[2].id); } void MercurialPlugin::testLogResolving() { QByteArray data( "changeset: 18473:692cbda1eb50\n" "branch: stable\n" "bookmark: @\n" "tag: tip\n" "user: FUJIWARA Katsunori \n" "date: Wed Jan 23 22:52:55 2013 +0900\n" "summary: revset: evaluate sub expressions correctly (issue3775)\n" "\n" "changeset: 18472:37100f30590f\n" "branch: stable\n" "user: Pierre-Yves David \n" "date: Sat Jan 19 04:08:16 2013 +0100\n" "summary: test-rebase: add another test for rebase with multiple roots\n" ); VcsBaseEditorWidget::testLogResolving(editorParameters[0].id, data, "18473:692cbda1eb50", "18472:37100f30590f"); } #endif } // namespace Internal } // namespace Mercurial