Thu, 09 Aug 2012 19:12:57 +0200
A few more changes dealing with the deprecated Transplant extension for Mercurial.
--- a/APIs/Python3/eric5.api Wed Aug 08 18:22:38 2012 +0200 +++ b/APIs/Python3/eric5.api Thu Aug 09 19:12:57 2012 +0200 @@ -4244,6 +4244,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.initMenu?4(mainMenu) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.menuTitle?4() +eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.setObjects?4(vcsObject, projectObject) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper?1() eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.RevisionsValidator.validate?4(input, pos) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.RevisionsValidator?1(multiRevsAllowed, parent=None)
--- a/Documentation/Help/source.qhp Wed Aug 08 18:22:38 2012 +0200 +++ b/Documentation/Help/source.qhp Thu Aug 09 19:12:57 2012 +0200 @@ -10541,6 +10541,7 @@ <keyword name="TransplantProjectHelper.initActions" id="TransplantProjectHelper.initActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.initActions" /> <keyword name="TransplantProjectHelper.initMenu" id="TransplantProjectHelper.initMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.initMenu" /> <keyword name="TransplantProjectHelper.menuTitle" id="TransplantProjectHelper.menuTitle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.menuTitle" /> + <keyword name="TransplantProjectHelper.setObjects" id="TransplantProjectHelper.setObjects" ref="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.setObjects" /> <keyword name="TrayStarter" id="TrayStarter" ref="eric5.Tools.TrayStarter.html#TrayStarter" /> <keyword name="TrayStarter (Constructor)" id="TrayStarter (Constructor)" ref="eric5.Tools.TrayStarter.html#TrayStarter.__init__" /> <keyword name="TrayStarter (Module)" id="TrayStarter (Module)" ref="eric5.Tools.TrayStarter.html" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html Wed Aug 08 18:22:38 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html Thu Aug 09 19:12:57 2012 +0200 @@ -75,6 +75,9 @@ </tr><tr> <td><a href="#TransplantProjectHelper.menuTitle">menuTitle</a></td> <td>Public method to get the menu title.</td> +</tr><tr> +<td><a href="#TransplantProjectHelper.setObjects">setObjects</a></td> +<td>Public method to set references to the vcs and project objects.</td> </tr> </table> <h3>Static Methods</h3> @@ -126,6 +129,19 @@ <dd> title of the menu (string) </dd> +</dl><a NAME="TransplantProjectHelper.setObjects" ID="TransplantProjectHelper.setObjects"></a> +<h4>TransplantProjectHelper.setObjects</h4> +<b>setObjects</b>(<i>vcsObject, projectObject</i>) +<p> + Public method to set references to the vcs and project objects. +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Wed Aug 08 18:22:38 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Thu Aug 09 19:12:57 2012 +0200 @@ -27,6 +27,20 @@ """ super().__init__() + def setObjects(self, vcsObject, projectObject): + """ + Public method to set references to the vcs and project objects. + + @param vcsObject reference to the vcs object + @param projectObject reference to the project object + """ + super().setObjects(vcsObject, projectObject) + + if self.vcs.version >= (2, 3): + # transplant is deprecated as of Mercurial 2.3 + for act in self.actions: + act.setEnabled(False) + def initActions(self): """ Public method to generate the action objects. @@ -69,10 +83,14 @@ """ menu = QMenu(self.menuTitle(), mainMenu) menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png")) - menu.setTearOffEnabled(True) - - menu.addAction(self.hgTransplantAct) - menu.addAction(self.hgTransplantContinueAct) + if self.vcs.version >= (2, 3): + # transplant is deprecated as of Mercurial 2.3 + menu.addAction(self.trUtf8("Transplant is deprecated")).setEnabled(False) + else: + menu.setTearOffEnabled(True) + + menu.addAction(self.hgTransplantAct) + menu.addAction(self.hgTransplantContinueAct) return menu