Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- changeset 2845
- 7e55c6268c35
- parent 2302
- f29e9405c851
- child 2847
- 1843ef6e2656
- child 3009
- bf5ae5d7477d
equal
deleted
inserted
replaced
| 2844:a61ee61b1c2c | 2845:7e55c6268c35 |
|---|---|
| 255 self.vcsMenuActions.append(act) | 255 self.vcsMenuActions.append(act) |
| 256 menu.addSeparator() | 256 menu.addSeparator() |
| 257 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 257 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 258 self.trUtf8('Show difference'), self._VCSDiff) | 258 self.trUtf8('Show difference'), self._VCSDiff) |
| 259 self.vcsMenuActions.append(act) | 259 self.vcsMenuActions.append(act) |
| 260 act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), | |
| 261 self.trUtf8('Show difference side-by-side'), self.__SVNSbsDiff) | |
| 262 self.vcsMenuActions.append(act) | |
| 260 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 263 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 261 self.trUtf8('Show difference (extended)'), | 264 self.trUtf8('Show difference (extended)'), |
| 262 self.__SVNExtendedDiff) | 265 self.__SVNExtendedDiff) |
| 266 self.vcsMenuActions.append(act) | |
| 267 act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), | |
| 268 self.trUtf8('Show difference side-by-side (extended)'), | |
| 269 self.__SVNSbsExtendedDiff) | |
| 263 self.vcsMenuActions.append(act) | 270 self.vcsMenuActions.append(act) |
| 264 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 271 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 265 self.trUtf8('Show difference (URLs)'), | 272 self.trUtf8('Show difference (URLs)'), |
| 266 self.__SVNUrlDiff) | 273 self.__SVNUrlDiff) |
| 267 self.vcsMenuActions.append(act) | 274 self.vcsMenuActions.append(act) |
| 765 names.append(itm.fileName()) | 772 names.append(itm.fileName()) |
| 766 except AttributeError: | 773 except AttributeError: |
| 767 names.append(itm.dirName()) | 774 names.append(itm.dirName()) |
| 768 self.vcs.svnUrlDiff(names) | 775 self.vcs.svnUrlDiff(names) |
| 769 | 776 |
| 777 def __SVNSbsDiff(self): | |
| 778 """ | |
| 779 Private slot called by the context menu to show the difference of a file to | |
| 780 the repository side-by-side. | |
| 781 """ | |
| 782 itm = self.browser.currentItem() | |
| 783 fn = itm.fileName() | |
| 784 self.vcs.svnSbsDiff(fn) | |
| 785 | |
| 786 def __SVNSbsExtendedDiff(self): | |
| 787 """ | |
| 788 Private slot called by the context menu to show the difference of a file to | |
| 789 the repository side-by-side allowing the selection of revisions to compare. | |
| 790 """ | |
| 791 itm = self.browser.currentItem() | |
| 792 fn = itm.fileName() | |
| 793 self.vcs.svnSbsDiff(fn, extended=True) | |
| 794 | |
| 770 def __SVNLogBrowser(self): | 795 def __SVNLogBrowser(self): |
| 771 """ | 796 """ |
| 772 Private slot called by the context menu to show the log browser for a file. | 797 Private slot called by the context menu to show the log browser for a file. |
| 773 """ | 798 """ |
| 774 itm = self.browser.currentItem() | 799 itm = self.browser.currentItem() |
| 775 try: | 800 try: |
| 776 fn = itm.fileName() | 801 fn = itm.fileName() |
| 802 isFile = True | |
| 777 except AttributeError: | 803 except AttributeError: |
| 778 fn = itm.dirName() | 804 fn = itm.dirName() |
| 779 self.vcs.svnLogBrowser(fn) | 805 isFile = False |
| 806 self.vcs.svnLogBrowser(fn, isFile=isFile) | |
| 780 | 807 |
| 781 def __SVNBlame(self): | 808 def __SVNBlame(self): |
| 782 """ | 809 """ |
| 783 Private slot called by the context menu to show the blame of a file. | 810 Private slot called by the context menu to show the blame of a file. |
| 784 """ | 811 """ |
