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

Mercurial: Work on Windows using Tortoise Hg, polishing.

Browse Source 
Do not use "cmd /c hg" on Windows as this will fail randomly
depending on arguments with blanks, such as "-U 8". Output log
messages about synchronous commands, format author correctly,
label menus correctly.
This commit is contained in:
Friedemann Kleint
2009-11-05 12:45:02 +01:00
parent c8bb7e174b
commit d570b05bec
10 changed files with 130 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -199,6 +199,11 @@ MercurialSettings *MercurialPlugin::settings()
return mercurialSettings;
}
QStringList MercurialPlugin::standardArguments() const
{
return mercurialSettings->standardArguments();
}
void MercurialPlugin::createMenu()
{
QList<int> context = QList<int>()<< core->uniqueIDManager()->uniqueIdentifier(QLatin1String(Core::Constants::C_GLOBAL));
@@ -316,7 +321,7 @@ void MercurialPlugin::createDirectoryActions(const QList<int> &context)
connect(action, SIGNAL(triggered()), this, SLOT(logRepository()));
mercurialContainer->addAction(command);
action = new QAction(tr("Revert"), this);
action = new QAction(tr("Revert..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::REVERTMULTI), context);
connect(action, SIGNAL(triggered()), this, SLOT(revertMulti()));
@@ -354,43 +359,43 @@ void MercurialPlugin::statusMulti()
void MercurialPlugin::createRepositoryActions(const QList<int> &context)
{
QAction *action = new QAction(tr("Pull"), this);
QAction *action = new QAction(tr("Pull..."), this);
actionList.append(action);
Core::Command *command = actionManager->registerAction(action, QLatin1String(Constants::PULL), context);
connect(action, SIGNAL(triggered()), this, SLOT(pull()));
mercurialContainer->addAction(command);
action = new QAction(tr("Push"), this);
action = new QAction(tr("Push..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::PUSH), context);
connect(action, SIGNAL(triggered()), this, SLOT(push()));
mercurialContainer->addAction(command);
action = new QAction(tr("Update"), this);
action = new QAction(tr("Update..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::UPDATE), context);
connect(action, SIGNAL(triggered()), this, SLOT(update()));
mercurialContainer->addAction(command);
action = new QAction(tr("Import"), this);
action = new QAction(tr("Import..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::IMPORT), context);
connect(action, SIGNAL(triggered()), this, SLOT(import()));
mercurialContainer->addAction(command);
action = new QAction(tr("Incoming"), this);
action = new QAction(tr("Incoming..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::INCOMING), context);
connect(action, SIGNAL(triggered()), this, SLOT(incoming()));
mercurialContainer->addAction(command);
action = new QAction(tr("Outgoing"), this);
action = new QAction(tr("Outgoing..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::OUTGOING), context);
connect(action, SIGNAL(triggered()), this, SLOT(outgoing()));
mercurialContainer->addAction(command);
action = new QAction(tr("Commit"), this);
action = new QAction(tr("Commit..."), this);
actionList.append(action);
command = actionManager->registerAction(action, QLatin1String(Constants::COMMIT), context);
command->setDefaultKeySequence(QKeySequence(tr("Alt+H,Alt+C")));