Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 3349
- 2a034a7f1f54
- parent 3312
- 7535e5a5cbce
- child 3359
- 6b6c224d67d6
equal
deleted
inserted
replaced
| 3346:39f9273ebd61 | 3349:2a034a7f1f54 |
|---|---|
| 311 UI.PixmapCache.getIcon("vcsLog.png"), | 311 UI.PixmapCache.getIcon("vcsLog.png"), |
| 312 self.tr('Show log'), self._VCSLog) | 312 self.tr('Show log'), self._VCSLog) |
| 313 self.vcsMenuActions.append(act) | 313 self.vcsMenuActions.append(act) |
| 314 act = menu.addAction( | 314 act = menu.addAction( |
| 315 UI.PixmapCache.getIcon("vcsLog.png"), | 315 UI.PixmapCache.getIcon("vcsLog.png"), |
| 316 self.tr('Show log browser'), self.__HgLogBrowser) | 316 self.tr('Show log browser'), self._VCSLogBrowser) |
| 317 self.vcsMenuActions.append(act) | 317 self.vcsMenuActions.append(act) |
| 318 menu.addSeparator() | 318 menu.addSeparator() |
| 319 act = menu.addAction( | 319 act = menu.addAction( |
| 320 UI.PixmapCache.getIcon("vcsStatus.png"), | 320 UI.PixmapCache.getIcon("vcsStatus.png"), |
| 321 self.tr('Show status'), self._VCSStatus) | 321 self.tr('Show status'), self._VCSStatus) |
| 529 UI.PixmapCache.getIcon("vcsLog.png"), | 529 UI.PixmapCache.getIcon("vcsLog.png"), |
| 530 self.tr('Show log'), self._VCSLog) | 530 self.tr('Show log'), self._VCSLog) |
| 531 self.vcsDirMenuActions.append(act) | 531 self.vcsDirMenuActions.append(act) |
| 532 act = menu.addAction( | 532 act = menu.addAction( |
| 533 UI.PixmapCache.getIcon("vcsLog.png"), | 533 UI.PixmapCache.getIcon("vcsLog.png"), |
| 534 self.tr('Show log browser'), self.__HgLogBrowser) | 534 self.tr('Show log browser'), self._VCSLogBrowser) |
| 535 self.vcsDirMenuActions.append(act) | 535 self.vcsDirMenuActions.append(act) |
| 536 menu.addSeparator() | 536 menu.addSeparator() |
| 537 act = menu.addAction( | 537 act = menu.addAction( |
| 538 UI.PixmapCache.getIcon("vcsStatus.png"), | 538 UI.PixmapCache.getIcon("vcsStatus.png"), |
| 539 self.tr('Show status'), self._VCSStatus) | 539 self.tr('Show status'), self._VCSStatus) |
| 736 file. | 736 file. |
| 737 """ | 737 """ |
| 738 itm = self.browser.currentItem() | 738 itm = self.browser.currentItem() |
| 739 fn = itm.fileName() | 739 fn = itm.fileName() |
| 740 self.vcs.hgAnnotate(fn) | 740 self.vcs.hgAnnotate(fn) |
| 741 | |
| 742 def __HgLogBrowser(self): | |
| 743 """ | |
| 744 Private slot called by the context menu to show the log browser for a | |
| 745 file. | |
| 746 """ | |
| 747 itm = self.browser.currentItem() | |
| 748 try: | |
| 749 fn = itm.fileName() | |
| 750 isFile = True | |
| 751 except AttributeError: | |
| 752 fn = itm.dirName() | |
| 753 isFile = False | |
| 754 self.vcs.hgLogBrowser(fn, isFile=isFile) | |
| 755 | 741 |
| 756 def __HgResolve(self): | 742 def __HgResolve(self): |
| 757 """ | 743 """ |
| 758 Private slot called by the context menu to resolve conflicts of a file. | 744 Private slot called by the context menu to resolve conflicts of a file. |
| 759 """ | 745 """ |
