Fixed a few issues with the Mercurial plug-in.

Sat, 24 Apr 2010 13:56:43 +0000

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 24 Apr 2010 13:56:43 +0000
changeset 198
7ab8e126f404
parent 197
0e12ee787967
child 199
675623ee5d7d

Fixed a few issues with the Mercurial plug-in.

Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py file | annotate | diff | comparison | revisions
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html	Sat Apr 24 13:46:33 2010 +0000
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html	Sat Apr 24 13:56:43 2010 +0000
@@ -94,7 +94,7 @@
 <td>Private slot connected to the finished signal.</td>
 </tr><tr>
 <td><a href="#HgLogBrowserDialog.__processBuffer">__processBuffer</a></td>
-<td>Private method to process the buffered output of the svn log command.</td>
+<td>Private method to process the buffered output of the hg log command.</td>
 </tr><tr>
 <td><a href="#HgLogBrowserDialog.__readStderr">__readStderr</a></td>
 <td>Private slot to handle the readyReadStandardError signal.</td>
@@ -166,7 +166,7 @@
 <td>Private slot called, when the from date changes.</td>
 </tr><tr>
 <td><a href="#HgLogBrowserDialog.start">start</a></td>
-<td>Public slot to start the svn log command.</td>
+<td>Public slot to start the hg log command.</td>
 </tr>
 </table>
 <a NAME="HgLogBrowserDialog.__init__" ID="HgLogBrowserDialog.__init__"></a>
@@ -386,7 +386,7 @@
 <h4>HgLogBrowserDialog.__processBuffer</h4>
 <b>__processBuffer</b>(<i></i>)
 <p>
-        Private method to process the buffered output of the svn log command.
+        Private method to process the buffered output of the hg log command.
 </p><a NAME="HgLogBrowserDialog.__readStderr" ID="HgLogBrowserDialog.__readStderr"></a>
 <h4>HgLogBrowserDialog.__readStderr</h4>
 <b>__readStderr</b>(<i></i>)
@@ -557,7 +557,7 @@
 <h4>HgLogBrowserDialog.start</h4>
 <b>start</b>(<i>fn</i>)
 <p>
-        Public slot to start the svn log command.
+        Public slot to start the hg log command.
 </p><dl>
 <dt><i>fn</i></dt>
 <dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html	Sat Apr 24 13:46:33 2010 +0000
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html	Sat Apr 24 13:56:43 2010 +0000
@@ -121,7 +121,7 @@
 <td>Private slot to send the input to the subversion process.</td>
 </tr><tr>
 <td><a href="#HgStatusDialog.start">start</a></td>
-<td>Public slot to start the svn status command.</td>
+<td>Public slot to start the hg status command.</td>
 </tr>
 </table>
 <a NAME="HgStatusDialog.__init__" ID="HgStatusDialog.__init__"></a>
@@ -303,7 +303,7 @@
 <h4>HgStatusDialog.start</h4>
 <b>start</b>(<i>fn</i>)
 <p>
-        Public slot to start the svn status command.
+        Public slot to start the hg status command.
 </p><dl>
 <dt><i>fn</i></dt>
 <dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html	Sat Apr 24 13:46:33 2010 +0000
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html	Sat Apr 24 13:56:43 2010 +0000
@@ -76,7 +76,7 @@
 <td>Protected slot used to edit the repository config file.</td>
 </tr><tr>
 <td><a href="#HgProjectHelper.__hgExtendedDiff">__hgExtendedDiff</a></td>
-<td>Private slot used to perform a svn diff with the selection of revisions.</td>
+<td>Private slot used to perform a hg diff with the selection of revisions.</td>
 </tr><tr>
 <td><a href="#HgProjectHelper.__hgHeads">__hgHeads</a></td>
 <td>Private slot used to show the heads of the repository.</td>
@@ -186,7 +186,7 @@
 <h4>HgProjectHelper.__hgExtendedDiff</h4>
 <b>__hgExtendedDiff</b>(<i></i>)
 <p>
-        Private slot used to perform a svn diff with the selection of revisions.
+        Private slot used to perform a hg diff with the selection of revisions.
 </p><a NAME="HgProjectHelper.__hgHeads" ID="HgProjectHelper.__hgHeads"></a>
 <h4>HgProjectHelper.__hgHeads</h4>
 <b>__hgHeads</b>(<i></i>)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Apr 24 13:46:33 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Apr 24 13:56:43 2010 +0000
@@ -206,7 +206,6 @@
         
         # add edges to the graph
         edges = []
-##        if rev and parents[0] != -1:
         if parents[0] != -1:
             for ecol, erev in enumerate(self.__revs):
                 if erev in next:
@@ -470,7 +469,7 @@
     
     def start(self, fn):
         """
-        Public slot to start the svn log command.
+        Public slot to start the hg log command.
         
         @param fn filename to show the log for (string)
         """
@@ -527,7 +526,7 @@
     
     def __processBuffer(self):
         """
-        Private method to process the buffered output of the svn log command.
+        Private method to process the buffered output of the hg log command.
         """
         noEntries = 0
         log = {"message" : []}
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sat Apr 24 13:46:33 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sat Apr 24 13:56:43 2010 +0000
@@ -62,17 +62,6 @@
             
             if directory:
                 self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory))
-##        else:
-##            dlg = SvnRepoBrowserDialog(self.vcs, mode = "select", parent = self)
-##            dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text())
-##            if dlg.exec_() == QDialog.Accepted:
-##                url = dlg.getSelectedUrl()
-##                if url:
-##                    protocol = url.split("://")[0]
-##                    path = url.split("://")[1]
-##                    self.protocolCombo.setCurrentIndex(\
-##                        self.protocolCombo.findText(protocol + "://"))
-##                    self.vcsUrlEdit.setText(path)
     
     @pyqtSlot()
     def on_projectDirButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Apr 24 13:46:33 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Apr 24 13:56:43 2010 +0000
@@ -136,7 +136,7 @@
     
     def start(self, fn):
         """
-        Public slot to start the svn status command.
+        Public slot to start the hg status command.
         
         @param fn filename(s)/directoryname(s) to show the status of
             (string or list of strings)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sat Apr 24 13:46:33 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sat Apr 24 13:56:43 2010 +0000
@@ -54,20 +54,13 @@
                 act.setEnabled(False)
             for act in standardItems:
                 act.setEnabled(False)
-##            if not hasattr(self.browser.currentItem(), 'fileName'):
-##                self.blameAct.setEnabled(False)
+            if not hasattr(self.browser.currentItem(), 'fileName'):
+                self.annotateAct.setEnabled(False)
         else:
             for act in self.vcsMenuActions:
                 act.setEnabled(False)
             for act in self.vcsAddMenuActions:
                 act.setEnabled(True)
-##            if 1 in self.browser.specialMenuEntries:
-##                try:
-##                    name = self.browser.currentItem().fileName()
-##                except AttributeError:
-##                    name = self.browser.currentItem().dirName()
-##                if not os.path.isdir(name):
-##                    self.vcsMenuAddTree.setEnabled(False)
             for act in standardItems:
                 act.setEnabled(True)
     
@@ -106,9 +99,6 @@
                 act.setEnabled(False)
             for act in self.vcsAddMultiMenuActions:
                 act.setEnabled(True)
-##            if 1 in self.browser.specialMenuEntries and \
-##               self.__itemsHaveFiles(items):
-##                self.vcsMultiMenuAddTree.setEnabled(False)
             for act in standardItems:
                 act.setEnabled(True)
     
@@ -209,11 +199,6 @@
             self.trUtf8('Add to repository'), 
             self._VCSAdd)
         self.vcsAddMenuActions.append(act)
-##        if 1 in self.browser.specialMenuEntries:
-##            self.vcsMenuAddTree = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"),
-##                self.trUtf8('Add tree to repository'), 
-##                self._VCSAddTree)
-##            self.vcsAddMenuActions.append(self.vcsMenuAddTree)
         act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"),
             self.trUtf8('Remove from repository (and disk)'), 
             self._VCSRemove)
@@ -298,11 +283,6 @@
         act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"),
             self.trUtf8('Add to repository'), self._VCSAdd)
         self.vcsAddMultiMenuActions.append(act)
-##        if 1 in self.browser.specialMenuEntries:
-##            self.vcsMultiMenuAddTree = \
-##                menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"),
-##                self.trUtf8('Add tree to repository'), self._VCSAddTree)
-##            self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree)
         act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"),
             self.trUtf8('Remove from repository (and disk)'), 
             self._VCSRemove)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat Apr 24 13:46:33 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat Apr 24 13:56:43 2010 +0000
@@ -648,7 +648,7 @@
     
     def __hgExtendedDiff(self):
         """
-        Private slot used to perform a svn diff with the selection of revisions.
+        Private slot used to perform a hg diff with the selection of revisions.
         """
         self.vcs.hgExtendedDiff(self.project.ppath)
     

eric ide

mercurial