Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 6467
- 56ef1ae1629d
- parent 6461
- 48bf6c3f084f
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6466:dac80ad0de75 | 6467:56ef1ae1629d |
|---|---|
| 91 | 91 |
| 92 if self.vcs.version >= (3, 8): | 92 if self.vcs.version >= (3, 8): |
| 93 self.actions.append(self.hgBookmarkPushCurrentAct) | 93 self.actions.append(self.hgBookmarkPushCurrentAct) |
| 94 self.__toolbarManager.addAction(self.hgBookmarkPushCurrentAct, | 94 self.__toolbarManager.addAction(self.hgBookmarkPushCurrentAct, |
| 95 title) | 95 title) |
| 96 | |
| 97 if self.vcs.version < (4, 7, 0): | |
| 98 self.hgGraftStopAct.setEnabled(False) | |
| 99 self.hgGraftAbortAct.setEnabled(False) | |
| 96 | 100 |
| 97 def getProject(self): | 101 def getProject(self): |
| 98 """ | 102 """ |
| 99 Public method to get a reference to the project object. | 103 Public method to get a reference to the project object. |
| 100 | 104 |
| 1001 """ were resolved.</p>""" | 1005 """ were resolved.</p>""" |
| 1002 )) | 1006 )) |
| 1003 self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) | 1007 self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) |
| 1004 self.actions.append(self.hgGraftContinueAct) | 1008 self.actions.append(self.hgGraftContinueAct) |
| 1005 | 1009 |
| 1006 if self.vcs.version >= (4, 7, 0): | 1010 self.hgGraftStopAct = E5Action( |
| 1007 self.hgGraftStopAct = E5Action( | 1011 self.tr('Stop Copying Session'), |
| 1008 self.tr('Stop Copying Session'), | 1012 self.tr('Stop Copying Session'), |
| 1009 self.tr('Stop Copying Session'), | 1013 0, 0, self, 'mercurial_graft_stop') |
| 1010 0, 0, self, 'mercurial_graft_stop') | 1014 self.hgGraftStopAct.setStatusTip(self.tr( |
| 1011 self.hgGraftStopAct.setStatusTip(self.tr( | 1015 'Stop the interrupted copying session' |
| 1012 'Stop the interrupted copying session' | 1016 )) |
| 1013 )) | 1017 self.hgGraftStopAct.setWhatsThis(self.tr( |
| 1014 self.hgGraftStopAct.setWhatsThis(self.tr( | 1018 """<b>Stop Copying Session</b>""" |
| 1015 """<b>Stop Copying Session</b>""" | 1019 """<p>This stops the interrupted copying session.</p>""" |
| 1016 """<p>This stops the interrupted copying session.</p>""" | 1020 )) |
| 1017 )) | 1021 self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) |
| 1018 self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) | 1022 self.actions.append(self.hgGraftStopAct) |
| 1019 self.actions.append(self.hgGraftStopAct) | 1023 |
| 1020 | 1024 self.hgGraftAbortAct = E5Action( |
| 1021 self.hgGraftAbortAct = E5Action( | 1025 self.tr('Abort Copying Session'), |
| 1022 self.tr('Abort Copying Session'), | 1026 self.tr('Abort Copying Session'), |
| 1023 self.tr('Abort Copying Session'), | 1027 0, 0, self, 'mercurial_graft_abort') |
| 1024 0, 0, self, 'mercurial_graft_abort') | 1028 self.hgGraftAbortAct.setStatusTip(self.tr( |
| 1025 self.hgGraftAbortAct.setStatusTip(self.tr( | 1029 'Abort the interrupted copying session and rollback' |
| 1026 'Abort the interrupted copying session and rollback' | 1030 )) |
| 1027 )) | 1031 self.hgGraftAbortAct.setWhatsThis(self.tr( |
| 1028 self.hgGraftAbortAct.setWhatsThis(self.tr( | 1032 """<b>Abort Copying Session</b>""" |
| 1029 """<b>Abort Copying Session</b>""" | 1033 """<p>This aborts the interrupted copying session and""" |
| 1030 """<p>This aborts the interrupted copying session and""" | 1034 """ rollbacks to the state before the copy.</p>""" |
| 1031 """ rollbacks to the state before the copy.</p>""" | 1035 )) |
| 1032 )) | 1036 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) |
| 1033 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) | 1037 self.actions.append(self.hgGraftAbortAct) |
| 1034 self.actions.append(self.hgGraftAbortAct) | |
| 1035 | 1038 |
| 1036 self.hgAddSubrepoAct = E5Action( | 1039 self.hgAddSubrepoAct = E5Action( |
| 1037 self.tr('Add'), | 1040 self.tr('Add'), |
| 1038 UI.PixmapCache.getIcon("vcsAdd.png"), | 1041 UI.PixmapCache.getIcon("vcsAdd.png"), |
| 1039 self.tr('Add...'), | 1042 self.tr('Add...'), |
