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

FossilPlugin: Drop namespace specifiers

Browse Source 
Remove some unused headers.

Change-Id: Ied6c6994604d567503b00bfb9e822e8e3784cca6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-04 11:12:22 +02:00
parent 0d15b4cded
commit 351c2cc463
3 changed files with 125 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/fossil/fossilclient.cpp
View File

@@ -884,7 +884,7 @@ void FossilLogHighlighter::highlightBlock(const QString &text)
void FossilClient::log(const FilePath &workingDir, const QStringList &files,
const QStringList &extraOptions,
bool enableAnnotationContextMenu,
const std::function<void(Utils::CommandLine &)> &addAuthOptions)
const std::function<void(CommandLine &)> &addAuthOptions)
{
// Show timeline for both repository and a file or path (--path <file-or-path>)
// When used for log repository, the files list is empty
@@ -940,7 +940,7 @@ void FossilClient::log(const FilePath &workingDir, const QStringList &files,
void FossilClient::logCurrentFile(const FilePath &workingDir, const QStringList &files,
const QStringList &extraOptions,
bool enableAnnotationContextMenu,
const std::function<void(Utils::CommandLine &)> &addAuthOptions)
const std::function<void(CommandLine &)> &addAuthOptions)
{
// Show commit history for the given file/file-revision
// NOTE: 'fossil finfo' shows full history from all branches.

243
src/plugins/fossil/fossilplugin.cpp
View File

@@ -16,15 +16,14 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/vcsmanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/helpmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/locator/commandlocator.h>
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/jsexpander.h>
#include <coreplugin/locator/commandlocator.h>
#include <coreplugin/vcsmanager.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projecttree.h>
@@ -39,7 +38,6 @@
#include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/basevcssubmiteditorfactory.h>
#include <vcsbase/vcsbaseclient.h>
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsbaseeditor.h>
#include <vcsbase/vcsbasesubmiteditor.h>
#include <vcsbase/vcscommand.h>
@@ -49,12 +47,10 @@
#include <QDialog>
#include <QDialogButtonBox>
#include <QDir>
#include <QFileDialog>
#include <QGroupBox>
#include <QMenu>
#include <QMessageBox>
#include <QRegularExpression>
#include <QtPlugin>
using namespace Core;
using namespace Utils;
@@ -64,7 +60,7 @@ using namespace std::placeholders;
namespace Fossil {
namespace Internal {
class FossilTopicCache : public Core::IVersionControl::TopicCache
class FossilTopicCache : public IVersionControl::TopicCache
{
public:
FossilTopicCache(FossilClient *client) :
@@ -115,7 +111,7 @@ const VcsBaseSubmitEditorParameters submitEditorParameters {
};
class FossilPluginPrivate final : public VcsBase::VcsBasePluginPrivate
class FossilPluginPrivate final : public VcsBasePluginPrivate
{
public:
enum SyncMode {
@@ -146,11 +142,11 @@ public:
void vcsDescribe(const FilePath &source, const QString &id) final;
VcsCommand *createInitialCheckoutCommand(const QString &url,
const Utils::FilePath &baseDirectory,
const FilePath &baseDirectory,
const QString &localName,
const QStringList &extraArgs) final;
void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override;
void updateActions(VcsBasePluginPrivate::ActionState) override;
bool activateCommit() override;
// File menu action slots
@@ -174,15 +170,15 @@ public:
void update();
void configureRepository();
void commit();
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
void showCommitWidget(const QList<VcsBaseClient::StatusItem> &status);
void diffFromEditorSelected(const QStringList &files);
void createRepository();
// Methods
void createMenu(const Core::Context &context);
void createFileActions(const Core::Context &context);
void createDirectoryActions(const Core::Context &context);
void createRepositoryActions(const Core::Context &context);
void createMenu(const Context &context);
void createFileActions(const Context &context);
void createDirectoryActions(const Context &context);
void createRepositoryActions(const Context &context);
bool pullOrPush(SyncMode mode);
@@ -213,26 +209,26 @@ public:
std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2)
};
Core::CommandLocator *m_commandLocator = nullptr;
Core::ActionContainer *m_fossilContainer = nullptr;
CommandLocator *m_commandLocator = nullptr;
ActionContainer *m_fossilContainer = nullptr;
QList<QAction *> m_repositoryActionList;
// Menu Items (file actions)
Utils::ParameterAction *m_addAction = nullptr;
Utils::ParameterAction *m_deleteAction = nullptr;
Utils::ParameterAction *m_annotateFile = nullptr;
Utils::ParameterAction *m_diffFile = nullptr;
Utils::ParameterAction *m_logFile = nullptr;
Utils::ParameterAction *m_revertFile = nullptr;
Utils::ParameterAction *m_statusFile = nullptr;
ParameterAction *m_addAction = nullptr;
ParameterAction *m_deleteAction = nullptr;
ParameterAction *m_annotateFile = nullptr;
ParameterAction *m_diffFile = nullptr;
ParameterAction *m_logFile = nullptr;
ParameterAction *m_revertFile = nullptr;
ParameterAction *m_statusFile = nullptr;
QAction *m_createRepositoryAction = nullptr;
// Submit editor actions
QAction *m_menuAction = nullptr;
Utils::FilePath m_submitRepository;
FilePath m_submitRepository;
// To be connected to the VcsTask's success signal to emit the repository/
// files changed signals according to the variant's type:
@@ -279,18 +275,18 @@ FossilClient *FossilPlugin::client()
}
FossilPluginPrivate::FossilPluginPrivate()
: VcsBase::VcsBasePluginPrivate(Core::Context(Constants::FOSSIL_CONTEXT))
: VcsBasePluginPrivate(Context(Constants::FOSSIL_CONTEXT))
{
Core::Context context(Constants::FOSSIL_CONTEXT);
Context context(Constants::FOSSIL_CONTEXT);
setTopicCache(new FossilTopicCache(&m_client));
connect(&m_client, &VcsBase::VcsBaseClient::changed, this, &FossilPluginPrivate::changed);
connect(&m_client, &VcsBaseClient::changed, this, &FossilPluginPrivate::changed);
m_commandLocator = new Core::CommandLocator("Fossil", "fossil", "fossil", this);
m_commandLocator = new CommandLocator("Fossil", "fossil", "fossil", this);
m_commandLocator->setDescription(Tr::tr("Triggers a Fossil version control operation."));
ProjectExplorer::JsonWizardFactory::addWizardPath(Utils::FilePath::fromString(Constants::WIZARD_PATH));
Core::JsExpander::registerGlobalObject("Fossil", [] { return new FossilJsExtension; });
ProjectExplorer::JsonWizardFactory::addWizardPath(FilePath::fromString(Constants::WIZARD_PATH));
JsExpander::registerGlobalObject("Fossil", [] { return new FossilJsExtension; });
connect(&settings(), &AspectContainer::changed,
this, &IVersionControl::configurationChanged);
@@ -298,10 +294,10 @@ FossilPluginPrivate::FossilPluginPrivate()
createMenu(context);
}
void FossilPluginPrivate::createMenu(const Core::Context &context)
void FossilPluginPrivate::createMenu(const Context &context)
{
// Create menu item for Fossil
m_fossilContainer = Core::ActionManager::createMenu("Fossil.FossilMenu");
m_fossilContainer = ActionManager::createMenu("Fossil.FossilMenu");
QMenu *menu = m_fossilContainer->menu();
menu->setTitle(Tr::tr("&Fossil"));
@@ -313,43 +309,47 @@ void FossilPluginPrivate::createMenu(const Core::Context &context)
m_fossilContainer->addSeparator(context);
// Request the Tools menu and add the Fossil menu to it
Core::ActionContainer *toolsMenu = Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
ActionContainer *toolsMenu = ActionManager::actionContainer(Core::Constants::M_TOOLS);
toolsMenu->addMenu(m_fossilContainer);
m_menuAction = m_fossilContainer->menu()->menuAction();
}
void FossilPluginPrivate::createFileActions(const Core::Context &context)
void FossilPluginPrivate::createFileActions(const Context &context)
{
Core::Command *command;
Command *command;
m_annotateFile = new Utils::ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_annotateFile, Constants::ANNOTATE, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_annotateFile = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_annotateFile, Constants::ANNOTATE, context);
command->setAttribute(Command::CA_UpdateText);
connect(m_annotateFile, &QAction::triggered, this, &FossilPluginPrivate::annotateCurrentFile);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_diffFile = new Utils::ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_diffFile, Constants::DIFF, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_diffFile = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_diffFile, Constants::DIFF, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+D")
: Tr::tr("Alt+I,Alt+D")));
connect(m_diffFile, &QAction::triggered, this, &FossilPluginPrivate::diffCurrentFile);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_logFile = new Utils::ParameterAction(Tr::tr("Timeline Current File"), Tr::tr("Timeline \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_logFile, Constants::LOG, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_logFile = new ParameterAction(Tr::tr("Timeline Current File"), Tr::tr("Timeline \"%1\""),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_logFile, Constants::LOG, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+L")
: Tr::tr("Alt+I,Alt+L")));
connect(m_logFile, &QAction::triggered, this, &FossilPluginPrivate::logCurrentFile);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_statusFile = new Utils::ParameterAction(Tr::tr("Status Current File"), Tr::tr("Status \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_statusFile, Constants::STATUS, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_statusFile = new ParameterAction(Tr::tr("Status Current File"), Tr::tr("Status \"%1\""),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_statusFile, Constants::STATUS, context);
command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+S")
: Tr::tr("Alt+I,Alt+S")));
connect(m_statusFile, &QAction::triggered, this, &FossilPluginPrivate::statusCurrentFile);
@@ -358,23 +358,26 @@ void FossilPluginPrivate::createFileActions(const Core::Context &context)
m_fossilContainer->addSeparator(context);
m_addAction = new Utils::ParameterAction(Tr::tr("Add Current File"), Tr::tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_addAction, Constants::ADD, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_addAction = new ParameterAction(Tr::tr("Add Current File"), Tr::tr("Add \"%1\""),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_addAction, Constants::ADD, context);
command->setAttribute(Command::CA_UpdateText);
connect(m_addAction, &QAction::triggered, this, &FossilPluginPrivate::addCurrentFile);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_deleteAction = new Utils::ParameterAction(Tr::tr("Delete Current File..."), Tr::tr("Delete \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_deleteAction, Constants::DELETE, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_deleteAction = new ParameterAction(Tr::tr("Delete Current File..."), Tr::tr("Delete \"%1\"..."),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_deleteAction, Constants::DELETE, context);
command->setAttribute(Command::CA_UpdateText);
connect(m_deleteAction, &QAction::triggered, this, &FossilPluginPrivate::deleteCurrentFile);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_revertFile = new Utils::ParameterAction(Tr::tr("Revert Current File..."), Tr::tr("Revert \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_revertFile, Constants::REVERT, context);
command->setAttribute(Core::Command::CA_UpdateText);
m_revertFile = new ParameterAction(Tr::tr("Revert Current File..."), Tr::tr("Revert \"%1\"..."),
ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_revertFile, Constants::REVERT, context);
command->setAttribute(Command::CA_UpdateText);
connect(m_revertFile, &QAction::triggered, this, &FossilPluginPrivate::revertCurrentFile);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
@@ -382,7 +385,7 @@ void FossilPluginPrivate::createFileActions(const Core::Context &context)
void FossilPluginPrivate::addCurrentFile()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client.synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
}
@@ -394,22 +397,22 @@ void FossilPluginPrivate::deleteCurrentFile()
void FossilPluginPrivate::annotateCurrentFile()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
const int lineNumber = VcsBase::VcsBaseEditor::lineNumberOfCurrentEditor(state.currentFile());
const int lineNumber = VcsBaseEditor::lineNumberOfCurrentEditor(state.currentFile());
m_client.annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), lineNumber);
}
void FossilPluginPrivate::diffCurrentFile()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client.diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
}
void FossilPluginPrivate::logCurrentFile()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
FossilClient::SupportedFeatures features = m_client.supportedFeatures();
QStringList extraOptions;
@@ -427,10 +430,10 @@ void FossilPluginPrivate::logCurrentFile()
void FossilPluginPrivate::revertCurrentFile()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent());
RevertDialog dialog(Tr::tr("Revert"), ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted) {
m_client.revertFile(state.currentFileTopLevel(), state.relativeCurrentFile(),
dialog.revision());
@@ -439,26 +442,26 @@ void FossilPluginPrivate::revertCurrentFile()
void FossilPluginPrivate::statusCurrentFile()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client.status(state.currentFileTopLevel(), state.relativeCurrentFile());
}
void FossilPluginPrivate::createDirectoryActions(const Core::Context &context)
void FossilPluginPrivate::createDirectoryActions(const Context &context)
{
QAction *action;
Core::Command *command;
Command *command;
action = new QAction(Tr::tr("Diff"), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::DIFFMULTI, context);
command = ActionManager::registerAction(action, Constants::DIFFMULTI, context);
connect(action, &QAction::triggered, this, &FossilPluginPrivate::diffRepository);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(Tr::tr("Timeline"), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::LOGMULTI, context);
command = ActionManager::registerAction(action, Constants::LOGMULTI, context);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+T")
: Tr::tr("Alt+I,Alt+T")));
connect(action, &QAction::triggered, this, &FossilPluginPrivate::logRepository);
@@ -467,14 +470,14 @@ void FossilPluginPrivate::createDirectoryActions(const Core::Context &context)
action = new QAction(Tr::tr("Revert..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::REVERTMULTI, context);
command = ActionManager::registerAction(action, Constants::REVERTMULTI, context);
connect(action, &QAction::triggered, this, &FossilPluginPrivate::revertAll);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(Tr::tr("Status"), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::STATUSMULTI, context);
command = ActionManager::registerAction(action, Constants::STATUSMULTI, context);
connect(action, &QAction::triggered, this, &FossilPluginPrivate::statusMulti);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
@@ -483,14 +486,14 @@ void FossilPluginPrivate::createDirectoryActions(const Core::Context &context)
void FossilPluginPrivate::diffRepository()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
m_client.diff(state.topLevel());
}
void FossilPluginPrivate::logRepository()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
FossilClient::SupportedFeatures features = m_client.supportedFeatures();
QStringList extraOptions;
@@ -504,43 +507,43 @@ void FossilPluginPrivate::logRepository()
void FossilPluginPrivate::revertAll()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent());
RevertDialog dialog(Tr::tr("Revert"), ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted)
m_client.revertAll(state.topLevel(), dialog.revision());
}
void FossilPluginPrivate::statusMulti()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
m_client.status(state.topLevel());
}
void FossilPluginPrivate::createRepositoryActions(const Core::Context &context)
void FossilPluginPrivate::createRepositoryActions(const Context &context)
{
QAction *action = 0;
Core::Command *command = 0;
Command *command = 0;
action = new QAction(Tr::tr("Pull..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::PULL, context);
command = ActionManager::registerAction(action, Constants::PULL, context);
connect(action, &QAction::triggered, this, &FossilPluginPrivate::pull);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(Tr::tr("Push..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::PUSH, context);
command = ActionManager::registerAction(action, Constants::PUSH, context);
connect(action, &QAction::triggered, this, &FossilPluginPrivate::push);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(Tr::tr("Update..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::UPDATE, context);
command = ActionManager::registerAction(action, Constants::UPDATE, context);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+U")
: Tr::tr("Alt+I,Alt+U")));
connect(action, &QAction::triggered, this, &FossilPluginPrivate::update);
@@ -549,7 +552,7 @@ void FossilPluginPrivate::createRepositoryActions(const Core::Context &context)
action = new QAction(Tr::tr("Commit..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::COMMIT, context);
command = ActionManager::registerAction(action, Constants::COMMIT, context);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+I,Meta+C")
: Tr::tr("Alt+I,Alt+C")));
connect(action, &QAction::triggered, this, &FossilPluginPrivate::commit);
@@ -558,7 +561,7 @@ void FossilPluginPrivate::createRepositoryActions(const Core::Context &context)
action = new QAction(Tr::tr("Settings..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Constants::CONFIGURE_REPOSITORY, context);
command = ActionManager::registerAction(action, Constants::CONFIGURE_REPOSITORY, context);
connect(action, &QAction::triggered, this, &FossilPluginPrivate::configureRepository);
m_fossilContainer->addAction(command);
m_commandLocator->appendCommand(command);
@@ -566,7 +569,7 @@ void FossilPluginPrivate::createRepositoryActions(const Core::Context &context)
// Register "Create Repository..." action in global context, so that it's visible
// without active repository to allow creating a new one.
m_createRepositoryAction = new QAction(Tr::tr("Create Repository..."), this);
command = Core::ActionManager::registerAction(m_createRepositoryAction, Constants::CREATE_REPOSITORY);
command = ActionManager::registerAction(m_createRepositoryAction, Constants::CREATE_REPOSITORY);
connect(m_createRepositoryAction, &QAction::triggered, this, &FossilPluginPrivate::createRepository);
m_fossilContainer->addAction(command);
}
@@ -585,10 +588,10 @@ bool FossilPluginPrivate::pullOrPush(FossilPluginPrivate::SyncMode mode)
return false;
}
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return false);
PullOrPushDialog dialog(pullOrPushMode, Core::ICore::dialogParent());
PullOrPushDialog dialog(pullOrPushMode, ICore::dialogParent());
dialog.setLocalBaseDirectory(m_client.settings().defaultRepoPath());
const QString defaultURL(m_client.synchronousGetRepositoryURL(state.topLevel()));
dialog.setDefaultRemoteLocation(defaultURL);
@@ -597,7 +600,7 @@ bool FossilPluginPrivate::pullOrPush(FossilPluginPrivate::SyncMode mode)
QString remoteLocation(dialog.remoteLocation());
if (remoteLocation.isEmpty() && defaultURL.isEmpty()) {
VcsBase::VcsOutputWindow::appendError(Tr::tr("Remote repository is not defined."));
VcsOutputWindow::appendError(Tr::tr("Remote repository is not defined."));
return false;
} else if (remoteLocation == defaultURL) {
remoteLocation.clear();
@@ -620,17 +623,17 @@ bool FossilPluginPrivate::pullOrPush(FossilPluginPrivate::SyncMode mode)
void FossilPluginPrivate::update()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
RevertDialog dialog(Tr::tr("Update"), Core::ICore::dialogParent());
RevertDialog dialog(Tr::tr("Update"), ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted)
m_client.update(state.topLevel(), dialog.revision());
}
void FossilPluginPrivate::configureRepository()
{
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
ConfigureDialog dialog;
@@ -654,7 +657,7 @@ void FossilPluginPrivate::commit()
if (raiseSubmitEditor())
return;
const VcsBase::VcsBasePluginState state = currentState();
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
m_submitRepository = state.topLevel();
@@ -662,36 +665,36 @@ void FossilPluginPrivate::commit()
m_client.emitParsedStatus(m_submitRepository, {});
}
void FossilPluginPrivate::showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status)
void FossilPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusItem> &status)
{
//Once we receive our data release the connection so it can be reused elsewhere
disconnect(&m_client, &VcsBaseClient::parsedStatus,
this, &FossilPluginPrivate::showCommitWidget);
if (status.isEmpty()) {
VcsBase::VcsOutputWindow::appendError(Tr::tr("There are no changes to commit."));
VcsOutputWindow::appendError(Tr::tr("There are no changes to commit."));
return;
}
// Start new temp file for commit message
Utils::TempFileSaver saver;
TempFileSaver saver;
// Keep the file alive, else it removes self and forgets its name
saver.setAutoRemove(false);
if (!saver.finalize()) {
VcsBase::VcsOutputWindow::appendError(saver.errorString());
VcsOutputWindow::appendError(saver.errorString());
return;
}
Core::IEditor *editor = Core::EditorManager::openEditor(saver.filePath(), Constants::COMMIT_ID);
IEditor *editor = EditorManager::openEditor(saver.filePath(), Constants::COMMIT_ID);
if (!editor) {
VcsBase::VcsOutputWindow::appendError(Tr::tr("Unable to create an editor for the commit."));
VcsOutputWindow::appendError(Tr::tr("Unable to create an editor for the commit."));
return;
}
CommitEditor *commitEditor = qobject_cast<CommitEditor *>(editor);
if (!commitEditor) {
VcsBase::VcsOutputWindow::appendError(Tr::tr("Unable to create a commit editor."));
VcsOutputWindow::appendError(Tr::tr("Unable to create a commit editor."));
return;
}
setSubmitEditor(commitEditor);
@@ -707,7 +710,7 @@ void FossilPluginPrivate::showCommitWidget(const QList<VcsBase::VcsBaseClient::S
tags.removeAll(currentBranch.name);
commitEditor->setFields(m_submitRepository, currentBranch, tags, currentUser, status);
connect(commitEditor, &VcsBase::VcsBaseSubmitEditor::diffSelectedFiles,
connect(commitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
this, &FossilPluginPrivate::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
}
@@ -729,16 +732,16 @@ void FossilPluginPrivate::createRepository()
// re-implemented from void VcsBasePlugin::createRepository()
// Find current starting directory
Utils::FilePath directory;
FilePath directory;
if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject())
directory = currentProject->projectDirectory();
// Prompt for a directory that is not under version control yet
QWidget *mw = Core::ICore::dialogParent();
QWidget *mw = ICore::dialogParent();
do {
directory = FileUtils::getExistingDirectory(nullptr, Tr::tr("Choose Checkout Directory"), directory);
if (directory.isEmpty())
return;
const Core::IVersionControl *managingControl = Core::VcsManager::findVersionControlForDirectory(directory);
const IVersionControl *managingControl = VcsManager::findVersionControlForDirectory(directory);
if (managingControl == 0)
break;
const QString question = Tr::tr("The directory \"%1\" is already managed by a version control system (%2)."
@@ -765,13 +768,13 @@ bool FossilPluginPrivate::activateCommit()
{
CommitEditor *commitEditor = qobject_cast<CommitEditor *>(submitEditor());
QTC_ASSERT(commitEditor, return true);
Core::IDocument *editorDocument = commitEditor->document();
IDocument *editorDocument = commitEditor->document();
QTC_ASSERT(editorDocument, return true);
QStringList files = commitEditor->checkedFiles();
if (!files.empty()) {
//save the commit message
if (!Core::DocumentManager::saveDocument(editorDocument))
if (!DocumentManager::saveDocument(editorDocument))
return false;
//rewrite entries of the form 'file => newfile' to 'newfile' because
@@ -811,7 +814,7 @@ bool FossilPluginPrivate::activateCommit()
}
void FossilPluginPrivate::updateActions(VcsBase::VcsBasePluginPrivate::ActionState as)
void FossilPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
{
m_createRepositoryAction->setEnabled(true);
@@ -885,14 +888,14 @@ bool FossilPluginPrivate::supportsOperation(Operation operation) const
bool supported = isConfigured();
switch (operation) {
case Core::IVersionControl::AddOperation:
case Core::IVersionControl::DeleteOperation:
case Core::IVersionControl::MoveOperation:
case Core::IVersionControl::CreateRepositoryOperation:
case Core::IVersionControl::AnnotateOperation:
case Core::IVersionControl::InitialCheckoutOperation:
case IVersionControl::AddOperation:
case IVersionControl::DeleteOperation:
case IVersionControl::MoveOperation:
case IVersionControl::CreateRepositoryOperation:
case IVersionControl::AnnotateOperation:
case IVersionControl::InitialCheckoutOperation:
break;
case Core::IVersionControl::SnapshotOperations:
case IVersionControl::SnapshotOperations:
supported = false;
break;
}
@@ -956,9 +959,9 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou
// -- open/checkout an existing local fossil
// Clone URL is an absolute local path and is the same as the local fossil.
const Utils::FilePath checkoutPath = baseDirectory.pathAppended(localName);
const FilePath checkoutPath = baseDirectory.pathAppended(localName);
const QString fossilFile = options.value("fossil-file");
const Utils::FilePath fossilFilePath = Utils::FilePath::fromUserInput(QDir::fromNativeSeparators(fossilFile));
const FilePath fossilFilePath = FilePath::fromUserInput(QDir::fromNativeSeparators(fossilFile));
const QString fossilFileNative = fossilFilePath.toUserOutput();
const QFileInfo cloneRepository(fossilFilePath.toString());
@@ -990,7 +993,7 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou
&& !cloneRepository.exists()) {
const QString sslIdentityFile = options.value("ssl-identity");
const Utils::FilePath sslIdentityFilePath = Utils::FilePath::fromUserInput(QDir::fromNativeSeparators(sslIdentityFile));
const FilePath sslIdentityFilePath = FilePath::fromUserInput(QDir::fromNativeSeparators(sslIdentityFile));
const bool includePrivate = (options.value("include-private") == "true");
QStringList extraOptions;
@@ -1052,7 +1055,7 @@ void FossilPluginPrivate::changed(const QVariant &v)
{
switch (v.type()) {
case QVariant::String:
emit repositoryChanged(Utils::FilePath::fromVariant(v));
emit repositoryChanged(FilePath::fromVariant(v));
break;
case QVariant::StringList:
emit filesChanged(v.toStringList());
@@ -1132,7 +1135,7 @@ void Fossil::Internal::FossilPlugin::testDiffFileResolving_data()
void Fossil::Internal::FossilPlugin::testDiffFileResolving()
{
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(dd->diffFactory);
VcsBaseEditorWidget::testDiffFileResolving(dd->diffFactory);
}
void Fossil::Internal::FossilPlugin::testLogResolving()
@@ -1145,6 +1148,6 @@ void Fossil::Internal::FossilPlugin::testLogResolving()
" EDITED src/core/scaler.cpp\n"
" EDITED src/core/scaler.h\n"
);
VcsBase::VcsBaseEditorWidget::testLogResolving(dd->fileLogFactory, data, "ac6d1129b8", "56d6917c3b");
VcsBaseEditorWidget::testLogResolving(dd->fileLogFactory, data, "ac6d1129b8", "56d6917c3b");
}
#endif

2
src/plugins/fossil/fossilplugin.h
View File

@@ -3,9 +3,7 @@
#pragma once
#include <vcsbase/vcsbaseclient.h>
#include <vcsbase/vcsbaseplugin.h>
#include <coreplugin/icontext.h>
namespace Fossil {
namespace Internal {