Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 2837
- a96cb48e86a5
- parent 2405
- d4b5f3bd4720
- child 2838
- 0f1423054184
equal
deleted
inserted
replaced
| 2836:289ad03f0e57 | 2837:a96cb48e86a5 |
|---|---|
| 226 self.trUtf8('Show status'), self._VCSStatus) | 226 self.trUtf8('Show status'), self._VCSStatus) |
| 227 self.vcsMenuActions.append(act) | 227 self.vcsMenuActions.append(act) |
| 228 menu.addSeparator() | 228 menu.addSeparator() |
| 229 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 229 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 230 self.trUtf8('Show difference'), self._VCSDiff) | 230 self.trUtf8('Show difference'), self._VCSDiff) |
| 231 self.vcsMenuActions.append(act) | |
| 232 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 233 self.trUtf8('Show difference side-by-side'), self.__HgSbsDiff) | |
| 231 self.vcsMenuActions.append(act) | 234 self.vcsMenuActions.append(act) |
| 232 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 235 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 233 self.trUtf8('Show difference (extended)'), | 236 self.trUtf8('Show difference (extended)'), |
| 234 self.__HgExtendedDiff) | 237 self.__HgExtendedDiff) |
| 235 self.vcsMenuActions.append(act) | 238 self.vcsMenuActions.append(act) |
| 564 try: | 567 try: |
| 565 names.append(itm.fileName()) | 568 names.append(itm.fileName()) |
| 566 except AttributeError: | 569 except AttributeError: |
| 567 names.append(itm.dirName()) | 570 names.append(itm.dirName()) |
| 568 self.vcs.hgExtendedDiff(names) | 571 self.vcs.hgExtendedDiff(names) |
| 572 | |
| 573 def __HgSbsDiff(self): | |
| 574 """ | |
| 575 Private slot called by the context menu to show the difference of a file to | |
| 576 the repository side-by-side. | |
| 577 """ | |
| 578 itm = self.browser.currentItem() | |
| 579 fn = itm.fileName() | |
| 580 self.vcs.hgSbsDiff(fn) | |
| 569 | 581 |
| 570 def __HgAnnotate(self): | 582 def __HgAnnotate(self): |
| 571 """ | 583 """ |
| 572 Private slot called by the context menu to show the annotations of a file. | 584 Private slot called by the context menu to show the annotations of a file. |
| 573 """ | 585 """ |
