Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -241,6 +241,7 @@
         act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"),
             self.trUtf8('Revert changes'), self.__HgRevert)
         self.vcsMenuActions.append(act)
+        # TODO: rename to "Conflict resolved (and subsequent occurrances)"
         act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve)
         self.vcsMenuActions.append(act)
         menu.addSeparator()

--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -219,6 +219,7 @@
         self.vcsExportAct.triggered[()].connect(self._vcsExport)
         self.actions.append(self.vcsExportAct)
         
+        # TODO: remove this action from the menu
         self.vcsAddAct = E5Action(self.trUtf8('Add to repository'),
                 UI.PixmapCache.getIcon("vcsAdd.png"),
                 self.trUtf8('&Add to repository...'), 0, 0, self, 'mercurial_add')
@@ -385,7 +386,8 @@
         ))
         self.vcsMergeAct.triggered[()].connect(self._vcsMerge)
         self.actions.append(self.vcsMergeAct)
-    
+        
+        # TODO: rename to "Conflicts resolved"
         self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'),
                 self.trUtf8('Resolve con&flicts'),
                 0, 0, self, 'mercurial_resolve')

--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -275,6 +275,7 @@
         act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"),
             self.trUtf8('Merge changes'), self._VCSMerge)
         self.vcsMenuActions.append(act)
+        # TODO: rename to "Conflict resolved (and subsequent occurrances)"
         act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve)
         self.vcsMenuActions.append(act)
         menu.addSeparator()

--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -86,6 +86,7 @@
         self.vcsCommitAct.triggered[()].connect(self._vcsCommit)
         self.actions.append(self.vcsCommitAct)
         
+        # TODO: remove this action from the menu
         self.vcsAddAct = E5Action(self.trUtf8('Add to repository'),
                 UI.PixmapCache.getIcon("vcsAdd.png"),
                 self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add')
@@ -297,6 +298,7 @@
         self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch)
         self.actions.append(self.vcsSwitchAct)
         
+        # TODO: rename to "Conflicts resolved"
         self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'),
                 self.trUtf8('Resolve con&flicts'),
                 0, 0, self, 'subversion_resolve')

--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -270,6 +270,7 @@
         act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"),
             self.trUtf8('Merge changes'), self._VCSMerge)
         self.vcsMenuActions.append(act)
+        # TODO: rename to "Conflict resolved (and subsequent occurrances)"
         act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve)
         self.vcsMenuActions.append(act)
         if self.vcs.version >= (1, 2, 0):

--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -86,6 +86,7 @@
         self.vcsCommitAct.triggered[()].connect(self._vcsCommit)
         self.actions.append(self.vcsCommitAct)
         
+        # TODO: remove this action from the menu
         self.vcsAddAct = E5Action(self.trUtf8('Add to repository'),
                 UI.PixmapCache.getIcon("vcsAdd.png"),
                 self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add')
@@ -282,6 +283,7 @@
         self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch)
         self.actions.append(self.vcsSwitchAct)
         
+        # TODO: rename to "Conflicts resolved"
         self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'),
                 self.trUtf8('Resolve con&flicts'),
                 0, 0, self, 'subversion_resolve')

--- a/Project/Project.py	Mon May 28 13:51:35 2012 +0200
+++ b/Project/Project.py	Mon May 28 15:59:36 2012 +0200
@@ -1946,6 +1946,7 @@
                         self.vcs = self.initVCS()
                         self.setDirty(True)
                         if self.vcs is not None:
+                            # TODO: ensure a minimal VCS configuration (mgmt dir excluded)
                             # edit VCS command options
                             vcores = E5MessageBox.yesNo(self.ui,
                                 self.trUtf8("New Project"),
@@ -2003,6 +2004,7 @@
                         self.vcs = self.initVCS()
                 self.setDirty(True)
                 if self.vcs is not None:
+                    # TODO: ensure a minimal VCS configuration (mgmt dir excluded)
                     # edit VCS command options
                     vcores = E5MessageBox.yesNo(self.ui,
                         self.trUtf8("New Project"),