Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun May 04 17:41:23 2014 +0200
+++ b/APIs/Python3/eric5.api	Sun May 04 18:07:57 2014 +0200
@@ -4549,7 +4549,7 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.startServer?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.stopServer?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.wasCanceled?4()
-eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient?1(repoPath, encoding, parent=None)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient?1(repoPath, encoding, vcs, parent=None)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.HgClientPromptDialog.getInput?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.HgClientPromptDialog.on_inputEdit_textChanged?4(txt)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.HgClientPromptDialog?1(size, message, parent=None)
@@ -4625,6 +4625,7 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.COLORS?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.AuthorColumn?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.BranchColumn?7
+eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.ClosedIndicator?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.DateColumn?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.IconColumn?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.LargefilesCacheL?7

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html	Sun May 04 17:41:23 2014 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgClient.html	Sun May 04 18:07:57 2014 +0200
@@ -112,7 +112,7 @@
 </table>
 <a NAME="HgClient.__init__" ID="HgClient.__init__"></a>
 <h4>HgClient (Constructor)</h4>
-<b>HgClient</b>(<i>repoPath, encoding, parent=None</i>)
+<b>HgClient</b>(<i>repoPath, encoding, vcs, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -122,6 +122,9 @@
 </dd><dt><i>encoding</i></dt>
 <dd>
 encoding to be used by the command server (string)
+</dd><dt><i>vcs</i></dt>
+<dd>
+reference to the VCS object (Hg)
 </dd><dt><i>parent</i></dt>
 <dd>
 reference to the parent object (QObject)

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html	Sun May 04 17:41:23 2014 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html	Sun May 04 18:07:57 2014 +0200
@@ -48,7 +48,7 @@
 QWidget, Ui_HgLogBrowserDialog
 <h3>Class Attributes</h3>
 <table>
-<tr><td>AuthorColumn</td></tr><tr><td>BranchColumn</td></tr><tr><td>DateColumn</td></tr><tr><td>IconColumn</td></tr><tr><td>LargefilesCacheL</td></tr><tr><td>LargefilesCacheW</td></tr><tr><td>MessageColumn</td></tr><tr><td>PathSeparatorRe</td></tr><tr><td>PhaseColumn</td></tr><tr><td>RevisionColumn</td></tr><tr><td>TagsColumn</td></tr>
+<tr><td>AuthorColumn</td></tr><tr><td>BranchColumn</td></tr><tr><td>ClosedIndicator</td></tr><tr><td>DateColumn</td></tr><tr><td>IconColumn</td></tr><tr><td>LargefilesCacheL</td></tr><tr><td>LargefilesCacheW</td></tr><tr><td>MessageColumn</td></tr><tr><td>PathSeparatorRe</td></tr><tr><td>PhaseColumn</td></tr><tr><td>RevisionColumn</td></tr><tr><td>TagsColumn</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>

--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sun May 04 17:41:23 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sun May 04 18:07:57 2014 +0200
@@ -33,12 +33,13 @@
     
     Channels = (b"I", b"L", b"o", b"e", b"r", b"d")
     
-    def __init__(self, repoPath, encoding, parent=None):
+    def __init__(self, repoPath, encoding, vcs, parent=None):
         """
         Constructor
         
         @param repoPath root directory of the repository (string)
         @param encoding encoding to be used by the command server (string)
+        @param vcs reference to the VCS object (Hg)
         @param parent reference to the parent object (QObject)
         """
         super(HgClient, self).__init__(parent)
@@ -46,13 +47,13 @@
         self.__server = None
         self.__started = False
         self.__version = None
-        self.__encoding = parent.getEncoding()
+        self.__encoding = vcs.getEncoding()
         self.__cancel = False
         self.__commandRunning = False
         self.__repoPath = repoPath
         
         # generate command line and environment
-        self.__serverArgs = parent.initCommand("serve")  # parent is hg
+        self.__serverArgs = vcs.initCommand("serve")
         self.__serverArgs.append("--cmdserver")
         self.__serverArgs.append("pipe")
         self.__serverArgs.append("--config")

--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sun May 04 17:41:23 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sun May 04 18:07:57 2014 +0200
@@ -64,7 +64,7 @@
                 # versions below that have a bug causing a second
                 # instance to not recognize changes to the status
                 from .HgClient import HgClient
-                client = HgClient(self.projectDir, "utf-8")
+                client = HgClient(self.projectDir, "utf-8", self.vcs)
                 ok, err = client.startServer()
                 if ok:
                     self.__client = client