Mercurial Repositories > eric / changeset

diff -r 4720cbf7ab52 -r 005c59af7989 APIs/Python3/eric6.api
--- a/APIs/Python3/eric6.api	Thu Oct 20 19:33:19 2016 +0200
+++ b/APIs/Python3/eric6.api	Fri Oct 21 18:25:23 2016 +0200
@@ -5000,6 +5000,8 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_currentIndexChanged?4(index)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_editTextChanged?4(text)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog?1(taglist, revision=None, tagName=None, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig._UserEditor?8
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.hgEditUserConfig?4(version=(0, 0))
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.HgUserConfigDataDialog.getData?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.HgUserConfigDataDialog?1(version=(0, 0), parent=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4()

diff -r 4720cbf7ab52 -r 005c59af7989 Documentation/Help/source.qch
Binary file Documentation/Help/source.qch has changed

diff -r 4720cbf7ab52 -r 005c59af7989 Documentation/Help/source.qhp
--- a/Documentation/Help/source.qhp	Thu Oct 20 19:33:19 2016 +0200
+++ b/Documentation/Help/source.qhp	Fri Oct 21 18:25:23 2016 +0200
@@ -608,6 +608,7 @@
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html" />
+                <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" />
@@ -7999,6 +8000,7 @@
       <keyword name="HgUnshelveDataDialog (Constructor)" id="HgUnshelveDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog.__init__" />
       <keyword name="HgUnshelveDataDialog (Module)" id="HgUnshelveDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html" />
       <keyword name="HgUnshelveDataDialog.getData" id="HgUnshelveDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog.getData" />
+      <keyword name="HgUserConfig (Module)" id="HgUserConfig (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html" />
       <keyword name="HgUserConfigDataDialog" id="HgUserConfigDataDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog" />
       <keyword name="HgUserConfigDataDialog (Constructor)" id="HgUserConfigDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog.__init__" />
       <keyword name="HgUserConfigDataDialog (Module)" id="HgUserConfigDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html" />
@@ -16335,6 +16337,7 @@
       <keyword name="hashPassword" id="hashPassword" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPassword" />
       <keyword name="hashPasswordTuple" id="hashPasswordTuple" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPasswordTuple" />
       <keyword name="hg (Module)" id="hg (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html" />
+      <keyword name="hgEditUserConfig" id="hgEditUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html#hgEditUserConfig" />
       <keyword name="html_encode" id="html_encode" ref="eric6.Utilities.__init__.html#html_encode" />
       <keyword name="html_udecode" id="html_udecode" ref="eric6.Utilities.__init__.html#html_udecode" />
       <keyword name="html_uencode" id="html_uencode" ref="eric6.Utilities.__init__.html#html_uencode" />
@@ -17142,6 +17145,7 @@
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html</file>
+      <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.html</file>

diff -r 4720cbf7ab52 -r 005c59af7989 Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html	Fri Oct 21 18:25:23 2016 +0200
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig</h1>
+<p>
+Module implementing the Mercurial version control plugin.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>_UserEditor</td></tr><tr><td>__all__</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#hgEditUserConfig">hgEditUserConfig</a></td>
+<td>Module function used to edit the user configuration file.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="hgEditUserConfig" ID="hgEditUserConfig"></a>
+<h2>hgEditUserConfig</h2>
+<b>hgEditUserConfig</b>(<i>version=(0, 0)</i>)
+<p>
+    Module function used to edit the user configuration file.
+</p><dl>
+<dt><i>version</i></dt>
+<dd>
+Mercurial version info (tuple of two integers)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

diff -r 4720cbf7ab52 -r 005c59af7989 Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html	Thu Oct 20 19:33:19 2016 +0200
+++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html	Fri Oct 21 18:25:23 2016 +0200
@@ -191,6 +191,9 @@
 <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html">HgTagDialog</a></td>
 <td>Module implementing a dialog to enter the data for a tagging operation.</td>
 </tr><tr>
+<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html">HgUserConfig</a></td>
+<td>Module implementing the Mercurial version control plugin.</td>
+</tr><tr>
 <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html">HgUserConfigDataDialog</a></td>
 <td>Module implementing a dialog to enter some user data.</td>
 </tr><tr>

diff -r 4720cbf7ab52 -r 005c59af7989 Plugins/VcsPlugins/vcsMercurial/HgUserConfig.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfig.py	Fri Oct 21 18:25:23 2016 +0200
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2010 - 2016 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing the Mercurial version control plugin.
+"""
+
+from __future__ import unicode_literals
+
+import os
+
+from PyQt5.QtWidgets import QDialog
+
+from QScintilla.MiniEditor import MiniEditor
+
+
+__all__ = ["hgEditUserConfig"]
+
+_UserEditor = None
+
+
+def hgEditUserConfig(version=(0, 0)):
+    """
+    Module function used to edit the user configuration file.
+    
+    @param version Mercurial version info (tuple of two integers)
+    """
+    global _UserEditor
+    
+    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=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
+    _UserEditor = MiniEditor(cfgFile, "Properties")
+    _UserEditor.show()