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

Mercurial: Make commiter/commiter email work again

Browse Source 
We tried to get the data from a settings object that was removed
elsewhere:-/

Task-number: QTCREATORBUG-14945
Change-Id: Ib7c1b9ced0cae776f24f250ebda24bcf14d3a782
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-09-02 17:02:08 +02:00
parent 91848f4755
commit 1381b80f4b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -560,8 +560,8 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s
QString branch = versionControl()->vcsTopic(m_submitRepository); QString branch = versionControl()->vcsTopic(m_submitRepository);
commitEditor->setFields(m_submitRepository, branch, commitEditor->setFields(m_submitRepository, branch,
mercurialSettings.stringValue(MercurialSettings::userNameKey), m_client->settings().stringValue(MercurialSettings::userNameKey),
mercurialSettings.stringValue(MercurialSettings::userEmailKey), status); m_client->settings().stringValue(MercurialSettings::userEmailKey), status);
} }
void MercurialPlugin::diffFromEditorSelected(const QStringList &files) void MercurialPlugin::diffFromEditorSelected(const QStringList &files)

1
src/plugins/mercurial/mercurialplugin.h
View File

@@ -135,7 +135,6 @@ private:
// Variables // Variables
static MercurialPlugin *m_instance; static MercurialPlugin *m_instance;
MercurialSettings mercurialSettings;
OptionsPage *optionsPage; OptionsPage *optionsPage;
MercurialClient *m_client; MercurialClient *m_client;