Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8366
- 2a9f5153c438
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 689 try: | 689 try: |
| 690 name = itm.fileName() | 690 name = itm.fileName() |
| 691 except AttributeError: | 691 except AttributeError: |
| 692 name = itm.dirName() | 692 name = itm.dirName() |
| 693 names.append(name) | 693 names.append(name) |
| 694 self.vcs.hgRevert(names) | 694 self.vcs.vcsRevert(names) |
| 695 | 695 |
| 696 def __HgCopy(self): | 696 def __HgCopy(self): |
| 697 """ | 697 """ |
| 698 Private slot called by the context menu to copy the selected file. | 698 Private slot called by the context menu to copy the selected file. |
| 699 """ | 699 """ |
| 744 Private slot called by the context menu to show the difference of a | 744 Private slot called by the context menu to show the difference of a |
| 745 file to the repository side-by-side. | 745 file to the repository side-by-side. |
| 746 """ | 746 """ |
| 747 itm = self.browser.currentItem() | 747 itm = self.browser.currentItem() |
| 748 fn = itm.fileName() | 748 fn = itm.fileName() |
| 749 self.vcs.hgSbsDiff(fn) | 749 self.vcs.vcsSbsDiff(fn) |
| 750 | 750 |
| 751 def __HgSbsExtendedDiff(self): | 751 def __HgSbsExtendedDiff(self): |
| 752 """ | 752 """ |
| 753 Private slot called by the context menu to show the difference of a | 753 Private slot called by the context menu to show the difference of a |
| 754 file to the repository side-by-side. | 754 file to the repository side-by-side. |
| 755 | 755 |
| 756 It allows the selection of revisions to compare. | 756 It allows the selection of revisions to compare. |
| 757 """ | 757 """ |
| 758 itm = self.browser.currentItem() | 758 itm = self.browser.currentItem() |
| 759 fn = itm.fileName() | 759 fn = itm.fileName() |
| 760 self.vcs.hgSbsDiff(fn, extended=True) | 760 self.vcs.vcsSbsDiff(fn, extended=True) |
| 761 | 761 |
| 762 def __HgAnnotate(self): | 762 def __HgAnnotate(self): |
| 763 """ | 763 """ |
| 764 Private slot called by the context menu to show the annotations of a | 764 Private slot called by the context menu to show the annotations of a |
| 765 file. | 765 file. |
| 777 for itm in self.browser.getSelectedItems(): | 777 for itm in self.browser.getSelectedItems(): |
| 778 try: | 778 try: |
| 779 names.append(itm.fileName()) | 779 names.append(itm.fileName()) |
| 780 except AttributeError: | 780 except AttributeError: |
| 781 names.append(itm.dirName()) | 781 names.append(itm.dirName()) |
| 782 self.vcs.hgResolved(names) | 782 self.vcs.vcsResolved(names) |
| 783 | 783 |
| 784 def __HgUnresolved(self): | 784 def __HgUnresolved(self): |
| 785 """ | 785 """ |
| 786 Private slot called by the context menu to mark conflicts of a file | 786 Private slot called by the context menu to mark conflicts of a file |
| 787 as being unresolved. | 787 as being unresolved. |
| 790 for itm in self.browser.getSelectedItems(): | 790 for itm in self.browser.getSelectedItems(): |
| 791 try: | 791 try: |
| 792 names.append(itm.fileName()) | 792 names.append(itm.fileName()) |
| 793 except AttributeError: | 793 except AttributeError: |
| 794 names.append(itm.dirName()) | 794 names.append(itm.dirName()) |
| 795 self.vcs.hgResolved(names, unresolve=True) | 795 self.vcs.vcsResolved(names, unresolve=True) |
| 796 | 796 |
| 797 def __HgReMerge(self): | 797 def __HgReMerge(self): |
| 798 """ | 798 """ |
| 799 Private slot called by the context menu to re-merge a file. | 799 Private slot called by the context menu to re-merge a file. |
| 800 """ | 800 """ |
| 838 "Do you really want to remove these files" | 838 "Do you really want to remove these files" |
| 839 " from the repository?"), | 839 " from the repository?"), |
| 840 files) | 840 files) |
| 841 | 841 |
| 842 if dlg.exec() == QDialog.DialogCode.Accepted: | 842 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 843 self.vcs.hgForget(names) | 843 self.vcs.vcsForget(names) |
| 844 | 844 |
| 845 for fn in names: | 845 for fn in names: |
| 846 self._updateVCSStatus(fn) | 846 self._updateVCSStatus(fn) |
| 847 | 847 |
| 848 def __HgConfigure(self): | 848 def __HgConfigure(self): |
