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

Refactored the Mercurial plugin

Browse Source 
Refactored the mercurial plugin which led to new vcsbase common
tools (VCSBaseClient, VCSBaseClientSettings and VCSJobRunner)

Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
cerf
2011-02-28 13:40:04 +01:00
committed by Tobias Hunger
parent be81d25b73
commit 6c1dd96f12
16 changed files with 1590 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
{
typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory;
m_client = new MercurialClient();
m_client = new MercurialClient(mercurialSettings);
VCSBase::VCSBasePlugin::initialize(new MercurialControl(m_client));
core = Core::ICore::instance();
@@ -165,7 +165,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
optionsPage = new OptionsPage();
addAutoReleasedObject(optionsPage);
mercurialSettings.readSettings(core->settings());
mercurialSettings.readSettings(core->settings(), QLatin1String("Mercurial"));
connect(optionsPage, SIGNAL(settingsChanged()), m_client, SLOT(settingsChanged()));
@@ -296,7 +296,7 @@ void MercurialPlugin::addCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return)
m_client->add(state.currentFileTopLevel(), state.relativeCurrentFile());
m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
}
void MercurialPlugin::annotateCurrentFile()
@@ -395,7 +395,7 @@ void MercurialPlugin::revertMulti()
RevertDialog reverter;
if (reverter.exec() != QDialog::Accepted)
return;
m_client->revertRepository(state.topLevel(), reverter.revision());
m_client->revertAll(state.topLevel(), reverter.revision());
}
void MercurialPlugin::statusMulti()
@@ -473,7 +473,7 @@ void MercurialPlugin::pull()
dialog.setWindowTitle(tr("Pull Source"));
if (dialog.exec() != QDialog::Accepted)
return;
m_client->pullSync(state.topLevel(), dialog.getRepositoryString());
m_client->synchronousPull(state.topLevel(), dialog.getRepositoryString());
}
void MercurialPlugin::push()
@@ -485,7 +485,7 @@ void MercurialPlugin::push()
dialog.setWindowTitle(tr("Push Destination"));
if (dialog.exec() != QDialog::Accepted)
return;
m_client->pushSync(state.topLevel(), dialog.getRepositoryString());
m_client->synchronousPush(state.topLevel(), dialog.getRepositoryString());
}
void MercurialPlugin::update()
@@ -672,11 +672,14 @@ bool MercurialPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *sub
editorFile->save();
core->fileManager()->unblockFileChange(editorFile);
m_client->commit(commitEditor->repoRoot(), files, commitEditor->committerInfo(),
editorFile->fileName(), true);
QHash<int, QVariant> extraOptions;
extraOptions[MercurialClient::AuthorCommitOptionId] = commitEditor->committerInfo();
m_client->commit(m_submitRepository, files, editorFile->fileName(),
extraOptions);
}
return true;
}
void MercurialPlugin::deleteCommitLog()
{
if (changeLog) {