Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- branch
- Commit_Merge_addition
- changeset 7152
- a99df2004bb7
- parent 7010
- 5d6f5a69a952
- child 7155
- 334c7d0b5036
equal
deleted
inserted
replaced
| 7150:cfe71cde2eec | 7152:a99df2004bb7 |
|---|---|
| 417 """ project.</p>""" | 417 """ project.</p>""" |
| 418 )) | 418 )) |
| 419 self.vcsMergeAct.triggered.connect(self._vcsMerge) | 419 self.vcsMergeAct.triggered.connect(self._vcsMerge) |
| 420 self.actions.append(self.vcsMergeAct) | 420 self.actions.append(self.vcsMergeAct) |
| 421 | 421 |
| 422 self.hgCancelMergeAct = E5Action( | 422 self.hgCommitMergeAct = E5Action( |
| 423 self.tr('Cancel uncommitted merge'), | 423 self.tr('Commit Merge'), |
| 424 self.tr('Cancel uncommitted merge'), | 424 self.tr('Commit Merge'), |
| 425 0, 0, self, 'mercurial_commit_merge') | |
| 426 self.hgCommitMergeAct.setStatusTip(self.tr( | |
| 427 'Commit a merge.' | |
| 428 )) | |
| 429 self.hgCommitMergeAct.setWhatsThis(self.tr( | |
| 430 """<b>Commit a merge</b>""" | |
| 431 """<p>This commits a merge working directory</p>""" | |
| 432 )) | |
| 433 self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge) | |
| 434 self.actions.append(self.hgCommitMergeAct) | |
| 435 | |
| 436 self.hgAbortMergeAct = E5Action( | |
| 437 self.tr('Abort Merge'), | |
| 438 self.tr('Abort Merge'), | |
| 425 0, 0, self, 'mercurial_cancel_merge') | 439 0, 0, self, 'mercurial_cancel_merge') |
| 426 self.hgCancelMergeAct.setStatusTip(self.tr( | 440 self.hgAbortMergeAct.setStatusTip(self.tr( |
| 427 'Cancel an uncommitted merge and lose all changes' | 441 'Abort an uncommitted merge and lose all changes' |
| 428 )) | 442 )) |
| 429 self.hgCancelMergeAct.setWhatsThis(self.tr( | 443 self.hgAbortMergeAct.setWhatsThis(self.tr( |
| 430 """<b>Cancel uncommitted merge</b>""" | 444 """<b>Abort uncommitted merge</b>""" |
| 431 """<p>This cancels an uncommitted merge causing all changes""" | 445 """<p>This aborts an uncommitted merge causing all changes""" |
| 432 """ to be lost.</p>""" | 446 """ to be lost.</p>""" |
| 433 )) | 447 )) |
| 434 self.hgCancelMergeAct.triggered.connect(self.__hgCancelMerge) | 448 self.hgAbortMergeAct.triggered.connect(self.__hgAbortMerge) |
| 435 self.actions.append(self.hgCancelMergeAct) | 449 self.actions.append(self.hgAbortMergeAct) |
| 436 | 450 |
| 437 self.hgReMergeAct = E5Action( | 451 self.hgReMergeAct = E5Action( |
| 438 self.tr('Re-Merge'), | 452 self.tr('Re-Merge'), |
| 439 UI.PixmapCache.getIcon("vcsMerge.png"), | 453 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 440 self.tr('Re-Merge'), | 454 self.tr('Re-Merge'), |
| 1296 self.hgOutgoingAct.setEnabled(self.vcs.canPush()) | 1310 self.hgOutgoingAct.setEnabled(self.vcs.canPush()) |
| 1297 self.hgBookmarkPushAct.setEnabled(self.vcs.canPush()) | 1311 self.hgBookmarkPushAct.setEnabled(self.vcs.canPush()) |
| 1298 self.hgBookmarkOutgoingAct.setEnabled(self.vcs.canPush()) | 1312 self.hgBookmarkOutgoingAct.setEnabled(self.vcs.canPush()) |
| 1299 if self.vcs.version >= (3, 8): | 1313 if self.vcs.version >= (3, 8): |
| 1300 self.hgBookmarkPushCurrentAct.setEnabled(self.vcs.canPull()) | 1314 self.hgBookmarkPushCurrentAct.setEnabled(self.vcs.canPull()) |
| 1315 self.hgCommitMergeAct.setEnabled( | |
| 1316 self.vcs.canCommitMerge(self.project.ppath)) | |
| 1301 | 1317 |
| 1302 def initMenu(self, menu): | 1318 def initMenu(self, menu): |
| 1303 """ | 1319 """ |
| 1304 Public method to generate the VCS menu. | 1320 Public method to generate the VCS menu. |
| 1305 | 1321 |
| 1432 mergeMenu.addAction(self.vcsMergeAct) | 1448 mergeMenu.addAction(self.vcsMergeAct) |
| 1433 mergeMenu.addAction(self.hgShowConflictsAct) | 1449 mergeMenu.addAction(self.hgShowConflictsAct) |
| 1434 mergeMenu.addAction(self.vcsResolveAct) | 1450 mergeMenu.addAction(self.vcsResolveAct) |
| 1435 mergeMenu.addAction(self.hgUnresolveAct) | 1451 mergeMenu.addAction(self.hgUnresolveAct) |
| 1436 mergeMenu.addAction(self.hgReMergeAct) | 1452 mergeMenu.addAction(self.hgReMergeAct) |
| 1437 mergeMenu.addAction(self.hgCancelMergeAct) | 1453 mergeMenu.addAction(self.hgCommitMergeAct) |
| 1454 mergeMenu.addAction(self.hgAbortMergeAct) | |
| 1438 | 1455 |
| 1439 act = menu.addAction( | 1456 act = menu.addAction( |
| 1440 UI.PixmapCache.getIcon( | 1457 UI.PixmapCache.getIcon( |
| 1441 os.path.join("VcsPlugins", "vcsMercurial", "icons", | 1458 os.path.join("VcsPlugins", "vcsMercurial", "icons", |
| 1442 "mercurial.png")), | 1459 "mercurial.png")), |
| 1531 toolbarManager.addAction(self.hgExtDiffAct, title) | 1548 toolbarManager.addAction(self.hgExtDiffAct, title) |
| 1532 toolbarManager.addAction(self.hgSummaryAct, title) | 1549 toolbarManager.addAction(self.hgSummaryAct, title) |
| 1533 toolbarManager.addAction(self.vcsRevertAct, title) | 1550 toolbarManager.addAction(self.vcsRevertAct, title) |
| 1534 toolbarManager.addAction(self.vcsMergeAct, title) | 1551 toolbarManager.addAction(self.vcsMergeAct, title) |
| 1535 toolbarManager.addAction(self.hgReMergeAct, title) | 1552 toolbarManager.addAction(self.hgReMergeAct, title) |
| 1553 toolbarManager.addAction(self.hgCommitMergeAct, title) | |
| 1536 toolbarManager.addAction(self.vcsTagAct, title) | 1554 toolbarManager.addAction(self.vcsTagAct, title) |
| 1537 toolbarManager.addAction(self.hgBranchAct, title) | 1555 toolbarManager.addAction(self.hgBranchAct, title) |
| 1538 toolbarManager.addAction(self.vcsSwitchAct, title) | 1556 toolbarManager.addAction(self.vcsSwitchAct, title) |
| 1539 toolbarManager.addAction(self.hgGraftAct, title) | 1557 toolbarManager.addAction(self.hgGraftAct, title) |
| 1540 toolbarManager.addAction(self.hgAddSubrepoAct, title) | 1558 toolbarManager.addAction(self.hgAddSubrepoAct, title) |
| 1703 """ | 1721 """ |
| 1704 Private slot used to mark conflicts of the local project as being | 1722 Private slot used to mark conflicts of the local project as being |
| 1705 unresolved. | 1723 unresolved. |
| 1706 """ | 1724 """ |
| 1707 self.vcs.hgResolved(self.project.ppath, unresolve=True) | 1725 self.vcs.hgResolved(self.project.ppath, unresolve=True) |
| 1708 | 1726 |
| 1709 def __hgCancelMerge(self): | 1727 def __hgCommitMerge(self): |
| 1710 """ | 1728 """ |
| 1711 Private slot used to cancel an uncommitted merge. | 1729 Private slot used to commit a merge. |
| 1712 """ | 1730 """ |
| 1713 self.vcs.hgCancelMerge(self.project.ppath) | 1731 self.vcs.vcsCommit(self.project.ppath, 'Merge', merge=True) |
| 1732 | |
| 1733 def __hgAbortMerge(self): | |
| 1734 """ | |
| 1735 Private slot used to abort an uncommitted merge. | |
| 1736 """ | |
| 1737 self.vcs.hgAbortMerge(self.project.ppath) | |
| 1714 | 1738 |
| 1715 def __hgShowConflicts(self): | 1739 def __hgShowConflicts(self): |
| 1716 """ | 1740 """ |
| 1717 Private slot used to list all files with conflicts. | 1741 Private slot used to list all files with conflicts. |
| 1718 """ | 1742 """ |
