diff -r 5fc76ccd369e -r 4720cbf7ab52 Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py --- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Thu Oct 20 18:55:14 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Thu Oct 20 19:33:19 2016 +0200 @@ -9,10 +9,7 @@ from __future__ import unicode_literals -import os - from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog from Preferences.ConfigurationPages.ConfigurationPageBase import \ ConfigurationPageBase @@ -114,38 +111,5 @@ """ Private slot to edit the (per user) Mercurial configuration file. """ - from QScintilla.MiniEditor import MiniEditor - cfgFile = self.__plugin.getConfigPath() - if not os.path.exists(cfgFile): - from ..HgUserConfigDataDialog import HgUserConfigDataDialog - dlg = HgUserConfigDataDialog() - if dlg.exec_() == QDialog.Accepted: - firstName, lastName, email, extensions, extensionsData = \ - dlg.getData() - else: - firstName, lastName, email, extensions, extensionsData = ( - "Firstname", "Lastname", "email_address", [], {}) - try: - f = open(cfgFile, "w") - f.write("[ui]\n") - f.write("username = {0} {1} <{2}>\n".format( - firstName, lastName, email)) - if extensions: - f.write("\n[extensions]\n") - f.write(" =\n".join(extensions)) - f.write(" =\n") # complete the last line - if "largefiles" in extensionsData: - dataDict = extensionsData["largefiles"] - f.write("\n[largefiles]\n") - if "minsize" in dataDict: - f.write("minsize = {0}\n".format(dataDict["minsize"])) - if "patterns" in dataDict: - f.write("patterns =\n") - f.write(" {0}\n".format( - "\n ".join(dataDict["patterns"]))) - f.close() - except (IOError, OSError): - # ignore these - pass - editor = MiniEditor(cfgFile, "Properties", self) - editor.show() + from ..HgUserConfig import hgEditUserConfig + hgEditUserConfig()