Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 1879
- 194a055fff04
- parent 1509
- c0b5e693b0eb
- child 1880
- dbd4d7698310
equal
deleted
inserted
replaced
| 1878:de889f485ae8 | 1879:194a055fff04 |
|---|---|
| 239 self.vcsMenuActions.append(self.annotateAct) | 239 self.vcsMenuActions.append(self.annotateAct) |
| 240 menu.addSeparator() | 240 menu.addSeparator() |
| 241 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 241 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 242 self.trUtf8('Revert changes'), self.__HgRevert) | 242 self.trUtf8('Revert changes'), self.__HgRevert) |
| 243 self.vcsMenuActions.append(act) | 243 self.vcsMenuActions.append(act) |
| 244 # TODO: rename to "Conflict resolved (and subsequent occurrances)" | |
| 244 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) | 245 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) |
| 245 self.vcsMenuActions.append(act) | 246 self.vcsMenuActions.append(act) |
| 246 menu.addSeparator() | 247 menu.addSeparator() |
| 247 menu.addAction(self.trUtf8('Select all local file entries'), | 248 menu.addAction(self.trUtf8('Select all local file entries'), |
| 248 self.browser.selectLocalEntries) | 249 self.browser.selectLocalEntries) |
