Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 3586
- 6e3a6c5b58bf
- parent 3515
- 1b8381afe38f
- child 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3585:f09a457c83fe | 3586:6e3a6c5b58bf |
|---|---|
| 349 act = menu.addAction( | 349 act = menu.addAction( |
| 350 UI.PixmapCache.getIcon("vcsRevert.png"), | 350 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 351 self.tr('Revert changes'), self.__HgRevert) | 351 self.tr('Revert changes'), self.__HgRevert) |
| 352 self.vcsMenuActions.append(act) | 352 self.vcsMenuActions.append(act) |
| 353 act = menu.addAction( | 353 act = menu.addAction( |
| 354 self.tr('Conflicts resolved'), self.__HgResolve) | 354 self.tr('Conflicts resolved'), self.__HgResolved) |
| 355 self.vcsMenuActions.append(act) | |
| 356 act = menu.addAction( | |
| 357 self.tr('Conflicts unresolved'), self.__HgUnresolved) | |
| 358 self.vcsMenuActions.append(act) | |
| 359 act = menu.addAction( | |
| 360 self.tr('Re-Merge'), self.__HgReMerge) | |
| 355 self.vcsMenuActions.append(act) | 361 self.vcsMenuActions.append(act) |
| 356 menu.addSeparator() | 362 menu.addSeparator() |
| 357 menu.addAction(self.tr('Select all local file entries'), | 363 menu.addAction(self.tr('Select all local file entries'), |
| 358 self.browser.selectLocalEntries) | 364 self.browser.selectLocalEntries) |
| 359 menu.addAction(self.tr('Select all versioned file entries'), | 365 menu.addAction(self.tr('Select all versioned file entries'), |
| 430 act = menu.addAction( | 436 act = menu.addAction( |
| 431 UI.PixmapCache.getIcon("vcsRevert.png"), | 437 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 432 self.tr('Revert changes'), self.__HgRevert) | 438 self.tr('Revert changes'), self.__HgRevert) |
| 433 self.vcsMultiMenuActions.append(act) | 439 self.vcsMultiMenuActions.append(act) |
| 434 act = menu.addAction( | 440 act = menu.addAction( |
| 435 self.tr('Conflicts resolved'), self.__HgResolve) | 441 self.tr('Conflicts resolved'), self.__HgResolved) |
| 442 self.vcsMultiMenuActions.append(act) | |
| 443 act = menu.addAction( | |
| 444 self.tr('Conflicts unresolved'), self.__HgUnresolved) | |
| 445 self.vcsMultiMenuActions.append(act) | |
| 446 act = menu.addAction( | |
| 447 self.tr('Re-Merge'), self.__HgReMerge) | |
| 436 self.vcsMultiMenuActions.append(act) | 448 self.vcsMultiMenuActions.append(act) |
| 437 menu.addSeparator() | 449 menu.addSeparator() |
| 438 menu.addAction(self.tr('Select all local file entries'), | 450 menu.addAction(self.tr('Select all local file entries'), |
| 439 self.browser.selectLocalEntries) | 451 self.browser.selectLocalEntries) |
| 440 menu.addAction(self.tr('Select all versioned file entries'), | 452 menu.addAction(self.tr('Select all versioned file entries'), |
| 554 act = menu.addAction( | 566 act = menu.addAction( |
| 555 UI.PixmapCache.getIcon("vcsRevert.png"), | 567 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 556 self.tr('Revert changes'), self.__HgRevert) | 568 self.tr('Revert changes'), self.__HgRevert) |
| 557 self.vcsDirMenuActions.append(act) | 569 self.vcsDirMenuActions.append(act) |
| 558 act = menu.addAction( | 570 act = menu.addAction( |
| 559 self.tr('Conflicts resolved'), self.__HgResolve) | 571 self.tr('Conflicts resolved'), self.__HgResolved) |
| 572 self.vcsDirMenuActions.append(act) | |
| 573 act = menu.addAction( | |
| 574 self.tr('Conflicts unresolved'), self.__HgUnresolved) | |
| 575 self.vcsDirMenuActions.append(act) | |
| 576 act = menu.addAction( | |
| 577 self.tr('Re-Merge'), self.__HgReMerge) | |
| 560 self.vcsDirMenuActions.append(act) | 578 self.vcsDirMenuActions.append(act) |
| 561 menu.addSeparator() | 579 menu.addSeparator() |
| 562 menu.addAction(self.tr('Select all local file entries'), | 580 menu.addAction(self.tr('Select all local file entries'), |
| 563 self.browser.selectLocalEntries) | 581 self.browser.selectLocalEntries) |
| 564 menu.addAction(self.tr('Select all versioned file entries'), | 582 menu.addAction(self.tr('Select all versioned file entries'), |
| 632 act = menu.addAction( | 650 act = menu.addAction( |
| 633 UI.PixmapCache.getIcon("vcsRevert.png"), | 651 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 634 self.tr('Revert changes'), self.__HgRevert) | 652 self.tr('Revert changes'), self.__HgRevert) |
| 635 self.vcsDirMultiMenuActions.append(act) | 653 self.vcsDirMultiMenuActions.append(act) |
| 636 act = menu.addAction( | 654 act = menu.addAction( |
| 637 self.tr('Conflicts resolved'), self.__HgResolve) | 655 self.tr('Conflicts resolved'), self.__HgResolved) |
| 656 self.vcsDirMultiMenuActions.append(act) | |
| 657 act = menu.addAction( | |
| 658 self.tr('Conflicts unresolved'), self.__HgUnresolved) | |
| 659 self.vcsDirMultiMenuActions.append(act) | |
| 660 act = menu.addAction( | |
| 661 self.tr('Re-Merge'), self.__HgReMerge) | |
| 638 self.vcsDirMultiMenuActions.append(act) | 662 self.vcsDirMultiMenuActions.append(act) |
| 639 menu.addSeparator() | 663 menu.addSeparator() |
| 640 menu.addAction(self.tr('Select all local file entries'), | 664 menu.addAction(self.tr('Select all local file entries'), |
| 641 self.browser.selectLocalEntries) | 665 self.browser.selectLocalEntries) |
| 642 menu.addAction(self.tr('Select all versioned file entries'), | 666 menu.addAction(self.tr('Select all versioned file entries'), |
| 739 """ | 763 """ |
| 740 itm = self.browser.currentItem() | 764 itm = self.browser.currentItem() |
| 741 fn = itm.fileName() | 765 fn = itm.fileName() |
| 742 self.vcs.hgAnnotate(fn) | 766 self.vcs.hgAnnotate(fn) |
| 743 | 767 |
| 744 def __HgResolve(self): | 768 def __HgResolved(self): |
| 745 """ | 769 """ |
| 746 Private slot called by the context menu to resolve conflicts of a file. | 770 Private slot called by the context menu to mark conflicts of a file |
| 771 as being resolved. | |
| 747 """ | 772 """ |
| 748 names = [] | 773 names = [] |
| 749 for itm in self.browser.getSelectedItems(): | 774 for itm in self.browser.getSelectedItems(): |
| 750 try: | 775 try: |
| 751 names.append(itm.fileName()) | 776 names.append(itm.fileName()) |
| 752 except AttributeError: | 777 except AttributeError: |
| 753 names.append(itm.dirName()) | 778 names.append(itm.dirName()) |
| 754 self.vcs.hgResolve(names) | 779 self.vcs.hgResolved(names) |
| 755 | 780 |
| 781 def __HgUnresolved(self): | |
| 782 """ | |
| 783 Private slot called by the context menu to mark conflicts of a file | |
| 784 as being unresolved. | |
| 785 """ | |
| 786 names = [] | |
| 787 for itm in self.browser.getSelectedItems(): | |
| 788 try: | |
| 789 names.append(itm.fileName()) | |
| 790 except AttributeError: | |
| 791 names.append(itm.dirName()) | |
| 792 self.vcs.hgResolved(names, unresolve=True) | |
| 793 | |
| 794 def __HgReMerge(self): | |
| 795 """ | |
| 796 Private slot called by the context menu to re-merge a file. | |
| 797 """ | |
| 798 names = [] | |
| 799 for itm in self.browser.getSelectedItems(): | |
| 800 try: | |
| 801 names.append(itm.fileName()) | |
| 802 except AttributeError: | |
| 803 names.append(itm.dirName()) | |
| 804 self.vcs.hgReMerge(names) | |
| 805 | |
| 756 def __HgForget(self): | 806 def __HgForget(self): |
| 757 """ | 807 """ |
| 758 Private slot called by the context menu to remove the selected file | 808 Private slot called by the context menu to remove the selected file |
| 759 from the Mercurial repository leaving a copy in the project directory. | 809 from the Mercurial repository leaving a copy in the project directory. |
| 760 """ | 810 """ |
