Corrected a bug in the Mercurial interface. 5_1_x

Fri, 27 May 2011 19:11:49 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 27 May 2011 19:11:49 +0200
branch
5_1_x
changeset 1065
37dc3819ce14
parent 1060
e56185898d97
child 1069
d1334d6abefa

Corrected a bug in the Mercurial interface.

Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html	Wed May 25 18:16:43 2011 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html	Fri May 27 19:11:49 2011 +0200
@@ -151,7 +151,7 @@
 <td>Public method used to resolve conflicts of a file/directory.</td>
 </tr><tr>
 <td><a href="#Hg.hgServe">hgServe</a></td>
-<td>Public method used to edit the repository config file.</td>
+<td>Public method used to serve the project.</td>
 </tr><tr>
 <td><a href="#Hg.hgShowBranch">hgShowBranch</a></td>
 <td>Public method used to show the current branch the working directory.</td>
@@ -630,7 +630,7 @@
 <h4>Hg.hgServe</h4>
 <b>hgServe</b>(<i>name</i>)
 <p>
-        Public method used to edit the repository config file.
+        Public method used to serve the project.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed May 25 18:16:43 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri May 27 19:11:49 2011 +0200
@@ -109,6 +109,7 @@
         self.annotate = None
         self.editor = None
         self.serveDlg = None
+        
         self.bundleFile = None
         
         self.statusCache = {}
@@ -142,6 +143,8 @@
             self.annotate.close()
         if self.serveDlg is not None:
             self.serveDlg.close()
+        if self.editor is not None:
+            self.editor.close()
         
         if self.bundleFile and os.path.exists(self.bundleFile):
             os.remove(self.bundleFile)
@@ -1987,7 +1990,7 @@
     
     def hgServe(self, name):
         """
-        Public method used to edit the repository config file.
+        Public method used to serve the project.
         
         @param name directory name (string)
         """

eric ide

mercurial