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

Mercurial: Save resources, polishing.

Browse Source 
Start the jobrunner on demand, save options only if changed,
give it the structure used elsewhere in the VCS plugins. Remove
last traces of the cmd /c hack.
This commit is contained in:
Friedemann Kleint
2009-11-06 12:32:38 +01:00
parent d570b05bec
commit b0e1fdbfc4
11 changed files with 194 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,8 +121,7 @@ static inline const VCSBase::VCSBaseEditorParameters *findType(int ie)
MercurialPlugin *MercurialPlugin::m_instance = 0;
MercurialPlugin::MercurialPlugin()
: mercurialSettings(new MercurialSettings),
MercurialPlugin::MercurialPlugin() :
optionsPage(0),
client(0),
mercurialVC(0),
@@ -139,11 +138,6 @@ MercurialPlugin::~MercurialPlugin()
client = 0;
}
if (mercurialSettings) {
delete mercurialSettings;
mercurialSettings = 0;
}
deleteCommitLog();
m_instance = 0;
@@ -161,6 +155,7 @@ bool MercurialPlugin::initialize(const QStringList &arguments, QString *error_me
optionsPage = new OptionsPage();
addAutoReleasedObject(optionsPage);
mercurialSettings.readSettings(core->settings());
client = new MercurialClient();
connect(optionsPage, SIGNAL(settingsChanged()), client, SLOT(settingsChanged()));
@@ -194,14 +189,21 @@ void MercurialPlugin::extensionsInitialized()
this, SLOT(currentProjectChanged(ProjectExplorer::Project *)));
}
MercurialSettings *MercurialPlugin::settings()
const MercurialSettings &MercurialPlugin::settings() const
{
return mercurialSettings;
}
void MercurialPlugin::setSettings(const MercurialSettings &settings)
{
if (settings != mercurialSettings) {
mercurialSettings = settings;
}
}
QStringList MercurialPlugin::standardArguments() const
{
return mercurialSettings->standardArguments();
return mercurialSettings.standardArguments();
}
void MercurialPlugin::createMenu()
@@ -530,8 +532,8 @@ void MercurialPlugin::showCommitWidget(const QList<QPair<QString, QString> > &st
QString branch = client->branchQuerySync(currentProjectRoot());
commitEditor->setFields(currentProjectRoot(), branch, mercurialSettings->userName(),
mercurialSettings->email(), status);
commitEditor->setFields(currentProjectRoot(), branch, mercurialSettings.userName(),
mercurialSettings.email(), status);
commitEditor->registerActions(editorUndo, editorRedo, editorCommit, editorDiff);
connect(commitEditor, SIGNAL(diffSelectedFiles(const QStringList &)),
@@ -564,11 +566,11 @@ bool MercurialPlugin::closeEditor(Core::IEditor *editor)
if (!editorFile || !commitEditor)
return true;
bool dummyPrompt = settings()->prompt();
bool dummyPrompt = mercurialSettings.prompt();
const VCSBase::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, settings()->prompt());
&dummyPrompt, mercurialSettings.prompt());
switch (response) {
case VCSBase::VCSBaseSubmitEditor::SubmitCanceled: