Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 3475
- 852dc7d65ff0
- parent 3472
- 9ea593813385
- child 3479
- 5ff8124c73aa
equal
deleted
inserted
replaced
| 3473:533226ce6c1e | 3475:852dc7d65ff0 |
|---|---|
| 846 """ care. </strong></p>""" | 846 """ care. </strong></p>""" |
| 847 )) | 847 )) |
| 848 self.hgRollbackAct.triggered.connect(self.__hgRollback) | 848 self.hgRollbackAct.triggered.connect(self.__hgRollback) |
| 849 self.actions.append(self.hgRollbackAct) | 849 self.actions.append(self.hgRollbackAct) |
| 850 | 850 |
| 851 # TODO: add support for hg update --clean to revert a failed/aborted merge | |
| 852 | |
| 851 self.hgServeAct = E5Action( | 853 self.hgServeAct = E5Action( |
| 852 self.tr('Serve project repository'), | 854 self.tr('Serve project repository'), |
| 853 self.tr('Serve project repository...'), | 855 self.tr('Serve project repository...'), |
| 854 0, 0, self, 'mercurial_serve') | 856 0, 0, self, 'mercurial_serve') |
| 855 self.hgServeAct.setStatusTip(self.tr( | 857 self.hgServeAct.setStatusTip(self.tr( |
| 1021 adminMenu.addSeparator() | 1023 adminMenu.addSeparator() |
| 1022 adminMenu.addAction(self.hgCreateIgnoreAct) | 1024 adminMenu.addAction(self.hgCreateIgnoreAct) |
| 1023 adminMenu.addSeparator() | 1025 adminMenu.addSeparator() |
| 1024 adminMenu.addAction(self.hgRecoverAct) | 1026 adminMenu.addAction(self.hgRecoverAct) |
| 1025 adminMenu.addSeparator() | 1027 adminMenu.addSeparator() |
| 1028 # TODO: add support for hg update --clean to revert a failed/aborted merge | |
| 1026 adminMenu.addAction(self.hgBackoutAct) | 1029 adminMenu.addAction(self.hgBackoutAct) |
| 1027 adminMenu.addAction(self.hgRollbackAct) | 1030 adminMenu.addAction(self.hgRollbackAct) |
| 1028 adminMenu.addSeparator() | 1031 adminMenu.addSeparator() |
| 1029 adminMenu.addAction(self.hgVerifyAct) | 1032 adminMenu.addAction(self.hgVerifyAct) |
| 1030 self.subMenus.append(adminMenu) | 1033 self.subMenus.append(adminMenu) |
| 1424 """ | 1427 """ |
| 1425 Private slot used to rollback the last transaction. | 1428 Private slot used to rollback the last transaction. |
| 1426 """ | 1429 """ |
| 1427 self.vcs.hgRollback(self.project.ppath) | 1430 self.vcs.hgRollback(self.project.ppath) |
| 1428 | 1431 |
| 1432 # TODO: add support for hg update --clean to revert a failed/aborted merge | |
| 1433 | |
| 1429 def __hgServe(self): | 1434 def __hgServe(self): |
| 1430 """ | 1435 """ |
| 1431 Private slot used to serve the project. | 1436 Private slot used to serve the project. |
| 1432 """ | 1437 """ |
| 1433 self.vcs.hgServe(self.project.ppath) | 1438 self.vcs.hgServe(self.project.ppath) |
