Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 2838
- 0f1423054184
- parent 2837
- a96cb48e86a5
- child 2839
- ae21f79512b7
equal
deleted
inserted
replaced
| 2837:a96cb48e86a5 | 2838:0f1423054184 |
|---|---|
| 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) | 231 self.vcsMenuActions.append(act) |
| 232 # TODO: create an icon for SBS mode | |
| 232 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 233 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 233 self.trUtf8('Show difference side-by-side'), self.__HgSbsDiff) | 234 self.trUtf8('Show difference side-by-side'), self.__HgSbsDiff) |
| 234 self.vcsMenuActions.append(act) | 235 self.vcsMenuActions.append(act) |
| 235 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | 236 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
| 236 self.trUtf8('Show difference (extended)'), | 237 self.trUtf8('Show difference (extended)'), |
| 237 self.__HgExtendedDiff) | 238 self.__HgExtendedDiff) |
| 239 self.vcsMenuActions.append(act) | |
| 240 # TODO: create an icon for SBS mode | |
| 241 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), | |
| 242 self.trUtf8('Show difference side-by-side (extended)'), | |
| 243 self.__HgSbsExtendedDiff) | |
| 238 self.vcsMenuActions.append(act) | 244 self.vcsMenuActions.append(act) |
| 239 self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), | 245 self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), |
| 240 self.__HgAnnotate) | 246 self.__HgAnnotate) |
| 241 self.vcsMenuActions.append(self.annotateAct) | 247 self.vcsMenuActions.append(self.annotateAct) |
| 242 menu.addSeparator() | 248 menu.addSeparator() |
| 576 the repository side-by-side. | 582 the repository side-by-side. |
| 577 """ | 583 """ |
| 578 itm = self.browser.currentItem() | 584 itm = self.browser.currentItem() |
| 579 fn = itm.fileName() | 585 fn = itm.fileName() |
| 580 self.vcs.hgSbsDiff(fn) | 586 self.vcs.hgSbsDiff(fn) |
| 587 | |
| 588 def __HgSbsExtendedDiff(self): | |
| 589 """ | |
| 590 Private slot called by the context menu to show the difference of a file to | |
| 591 the repository side-by-side allowing the selection of revisions to compare. | |
| 592 """ | |
| 593 itm = self.browser.currentItem() | |
| 594 fn = itm.fileName() | |
| 595 self.vcs.hgSbsDiff(fn, extended=True) | |
| 581 | 596 |
| 582 def __HgAnnotate(self): | 597 def __HgAnnotate(self): |
| 583 """ | 598 """ |
| 584 Private slot called by the context menu to show the annotations of a file. | 599 Private slot called by the context menu to show the annotations of a file. |
| 585 """ | 600 """ |
