diff -r 5fc76ccd369e -r 4720cbf7ab52 Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Oct 20 18:55:14 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Oct 20 19:33:19 2016 +0200
@@ -108,7 +108,6 @@
self.tagbranchList = None
self.annotate = None
self.repoEditor = None
- self.userEditor = None
self.serveDlg = None
self.bookmarksListDlg = None
self.bookmarksInOutDlg = None
@@ -2306,42 +2305,8 @@
"""
Public method used to edit the user configuration file.
"""
- from .HgUtilities import getConfigPath
- cfgFile = getConfigPath()
- if not os.path.exists(cfgFile):
- # open dialog to enter the initial data
- from .HgUserConfigDataDialog import HgUserConfigDataDialog
- dlg = HgUserConfigDataDialog(version=self.version)
- 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
- self.userEditor = MiniEditor(cfgFile, "Properties")
- self.userEditor.show()
+ from .HgUserConfig import hgEditUserConfig
+ hgEditUserConfig(version=self.version)
def hgEditConfig(self, name, withLargefiles=True, largefilesData=None):
"""
