Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 3479
- 5ff8124c73aa
- parent 3475
- 852dc7d65ff0
- child 3515
- 1b8381afe38f
equal
deleted
inserted
replaced
| 3478:beec1d9c1851 | 3479:5ff8124c73aa |
|---|---|
| 411 """ project.</p>""" | 411 """ project.</p>""" |
| 412 )) | 412 )) |
| 413 self.vcsMergeAct.triggered.connect(self._vcsMerge) | 413 self.vcsMergeAct.triggered.connect(self._vcsMerge) |
| 414 self.actions.append(self.vcsMergeAct) | 414 self.actions.append(self.vcsMergeAct) |
| 415 | 415 |
| 416 self.hgCancelMergeAct = E5Action( | |
| 417 self.tr('Cancel uncommitted merge'), | |
| 418 self.tr('Cancel uncommitted merge'), | |
| 419 0, 0, self, 'mercurial_cancel_merge') | |
| 420 self.hgCancelMergeAct.setStatusTip(self.tr( | |
| 421 'Cancel an uncommitted merge and lose all changes' | |
| 422 )) | |
| 423 self.hgCancelMergeAct.setWhatsThis(self.tr( | |
| 424 """<b>Cancel uncommitted merge</b>""" | |
| 425 """<p>This cancels an uncommitted merge causing all changes""" | |
| 426 """ to be lost.</p>""" | |
| 427 )) | |
| 428 self.hgCancelMergeAct.triggered.connect(self.__hgCancelMerge) | |
| 429 self.actions.append(self.hgCancelMergeAct) | |
| 430 | |
| 416 self.vcsResolveAct = E5Action( | 431 self.vcsResolveAct = E5Action( |
| 417 self.tr('Conflicts resolved'), | 432 self.tr('Conflicts resolved'), |
| 418 self.tr('Con&flicts resolved'), | 433 self.tr('Con&flicts resolved'), |
| 419 0, 0, self, 'mercurial_resolve') | 434 0, 0, self, 'mercurial_resolve') |
| 420 self.vcsResolveAct.setStatusTip(self.tr( | 435 self.vcsResolveAct.setStatusTip(self.tr( |
| 845 """</p><p><strong>This command is dangerous. Please use with""" | 860 """</p><p><strong>This command is dangerous. Please use with""" |
| 846 """ care. </strong></p>""" | 861 """ care. </strong></p>""" |
| 847 )) | 862 )) |
| 848 self.hgRollbackAct.triggered.connect(self.__hgRollback) | 863 self.hgRollbackAct.triggered.connect(self.__hgRollback) |
| 849 self.actions.append(self.hgRollbackAct) | 864 self.actions.append(self.hgRollbackAct) |
| 850 | |
| 851 # TODO: add support for hg update --clean to revert a failed/aborted merge | |
| 852 | 865 |
| 853 self.hgServeAct = E5Action( | 866 self.hgServeAct = E5Action( |
| 854 self.tr('Serve project repository'), | 867 self.tr('Serve project repository'), |
| 855 self.tr('Serve project repository...'), | 868 self.tr('Serve project repository...'), |
| 856 0, 0, self, 'mercurial_serve') | 869 0, 0, self, 'mercurial_serve') |
| 1023 adminMenu.addSeparator() | 1036 adminMenu.addSeparator() |
| 1024 adminMenu.addAction(self.hgCreateIgnoreAct) | 1037 adminMenu.addAction(self.hgCreateIgnoreAct) |
| 1025 adminMenu.addSeparator() | 1038 adminMenu.addSeparator() |
| 1026 adminMenu.addAction(self.hgRecoverAct) | 1039 adminMenu.addAction(self.hgRecoverAct) |
| 1027 adminMenu.addSeparator() | 1040 adminMenu.addSeparator() |
| 1028 # TODO: add support for hg update --clean to revert a failed/aborted merge | |
| 1029 adminMenu.addAction(self.hgBackoutAct) | 1041 adminMenu.addAction(self.hgBackoutAct) |
| 1030 adminMenu.addAction(self.hgRollbackAct) | 1042 adminMenu.addAction(self.hgRollbackAct) |
| 1031 adminMenu.addSeparator() | 1043 adminMenu.addSeparator() |
| 1032 adminMenu.addAction(self.hgVerifyAct) | 1044 adminMenu.addAction(self.hgVerifyAct) |
| 1033 self.subMenus.append(adminMenu) | 1045 self.subMenus.append(adminMenu) |
| 1140 menu.addAction(self.hgPhaseAct) | 1152 menu.addAction(self.hgPhaseAct) |
| 1141 menu.addSeparator() | 1153 menu.addSeparator() |
| 1142 menu.addAction(self.vcsRevertAct) | 1154 menu.addAction(self.vcsRevertAct) |
| 1143 menu.addAction(self.vcsMergeAct) | 1155 menu.addAction(self.vcsMergeAct) |
| 1144 menu.addAction(self.vcsResolveAct) | 1156 menu.addAction(self.vcsResolveAct) |
| 1157 menu.addAction(self.hgCancelMergeAct) | |
| 1145 menu.addSeparator() | 1158 menu.addSeparator() |
| 1146 menu.addAction(self.vcsSwitchAct) | 1159 menu.addAction(self.vcsSwitchAct) |
| 1147 menu.addSeparator() | 1160 menu.addSeparator() |
| 1148 if subrepoMenu is not None: | 1161 if subrepoMenu is not None: |
| 1149 menu.addMenu(subrepoMenu) | 1162 menu.addMenu(subrepoMenu) |
| 1271 """ | 1284 """ |
| 1272 Private slot used to resolve conflicts of the local project. | 1285 Private slot used to resolve conflicts of the local project. |
| 1273 """ | 1286 """ |
| 1274 self.vcs.hgResolve(self.project.ppath) | 1287 self.vcs.hgResolve(self.project.ppath) |
| 1275 | 1288 |
| 1289 def __hgCancelMerge(self): | |
| 1290 """ | |
| 1291 Private slot used to cancel an uncommitted merge. | |
| 1292 """ | |
| 1293 self.vcs.hgCancelMerge(self.project.ppath) | |
| 1294 | |
| 1276 def __hgTagList(self): | 1295 def __hgTagList(self): |
| 1277 """ | 1296 """ |
| 1278 Private slot used to list the tags of the project. | 1297 Private slot used to list the tags of the project. |
| 1279 """ | 1298 """ |
| 1280 self.vcs.hgListTagBranch(self.project.ppath, True) | 1299 self.vcs.hgListTagBranch(self.project.ppath, True) |
| 1427 """ | 1446 """ |
| 1428 Private slot used to rollback the last transaction. | 1447 Private slot used to rollback the last transaction. |
| 1429 """ | 1448 """ |
| 1430 self.vcs.hgRollback(self.project.ppath) | 1449 self.vcs.hgRollback(self.project.ppath) |
| 1431 | 1450 |
| 1432 # TODO: add support for hg update --clean to revert a failed/aborted merge | |
| 1433 | |
| 1434 def __hgServe(self): | 1451 def __hgServe(self): |
| 1435 """ | 1452 """ |
| 1436 Private slot used to serve the project. | 1453 Private slot used to serve the project. |
| 1437 """ | 1454 """ |
| 1438 self.vcs.hgServe(self.project.ppath) | 1455 self.vcs.hgServe(self.project.ppath) |
