Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 1311
- 95685f9ad9f8
- parent 1267
- 5eddb59304c7
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 1310:7fdcfa822e3e | 1311:95685f9ad9f8 |
|---|---|
| 237 self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), | 237 self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), |
| 238 self.__HgAnnotate) | 238 self.__HgAnnotate) |
| 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._VCSRevert) | 242 self.trUtf8('Revert changes'), self.__HgRevert) |
| 243 self.vcsMenuActions.append(act) | 243 self.vcsMenuActions.append(act) |
| 244 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) | 244 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) |
| 245 self.vcsMenuActions.append(act) | 245 self.vcsMenuActions.append(act) |
| 246 menu.addSeparator() | 246 menu.addSeparator() |
| 247 menu.addAction(self.trUtf8('Select all local file entries'), | 247 menu.addAction(self.trUtf8('Select all local file entries'), |
| 307 self.trUtf8('Show difference (extended)'), | 307 self.trUtf8('Show difference (extended)'), |
| 308 self.__HgExtendedDiff) | 308 self.__HgExtendedDiff) |
| 309 self.vcsMultiMenuActions.append(act) | 309 self.vcsMultiMenuActions.append(act) |
| 310 menu.addSeparator() | 310 menu.addSeparator() |
| 311 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 311 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 312 self.trUtf8('Revert changes'), self._VCSRevert) | 312 self.trUtf8('Revert changes'), self.__HgRevert) |
| 313 self.vcsMultiMenuActions.append(act) | 313 self.vcsMultiMenuActions.append(act) |
| 314 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) | 314 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) |
| 315 self.vcsMultiMenuActions.append(act) | 315 self.vcsMultiMenuActions.append(act) |
| 316 menu.addSeparator() | 316 menu.addSeparator() |
| 317 menu.addAction(self.trUtf8('Select all local file entries'), | 317 menu.addAction(self.trUtf8('Select all local file entries'), |
| 418 self.trUtf8('Show difference (extended)'), | 418 self.trUtf8('Show difference (extended)'), |
| 419 self.__HgExtendedDiff) | 419 self.__HgExtendedDiff) |
| 420 self.vcsDirMenuActions.append(act) | 420 self.vcsDirMenuActions.append(act) |
| 421 menu.addSeparator() | 421 menu.addSeparator() |
| 422 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 422 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 423 self.trUtf8('Revert changes'), self._VCSRevert) | 423 self.trUtf8('Revert changes'), self.__HgRevert) |
| 424 self.vcsDirMenuActions.append(act) | 424 self.vcsDirMenuActions.append(act) |
| 425 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) | 425 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) |
| 426 self.vcsDirMenuActions.append(act) | 426 self.vcsDirMenuActions.append(act) |
| 427 menu.addSeparator() | 427 menu.addSeparator() |
| 428 menu.addAction(self.trUtf8('Select all local file entries'), | 428 menu.addAction(self.trUtf8('Select all local file entries'), |
| 486 self.trUtf8('Show difference (extended)'), | 486 self.trUtf8('Show difference (extended)'), |
| 487 self.__HgExtendedDiff) | 487 self.__HgExtendedDiff) |
| 488 self.vcsDirMultiMenuActions.append(act) | 488 self.vcsDirMultiMenuActions.append(act) |
| 489 menu.addSeparator() | 489 menu.addSeparator() |
| 490 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 490 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 491 self.trUtf8('Revert changes'), self._VCSRevert) | 491 self.trUtf8('Revert changes'), self.__HgRevert) |
| 492 self.vcsDirMultiMenuActions.append(act) | 492 self.vcsDirMultiMenuActions.append(act) |
| 493 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) | 493 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) |
| 494 self.vcsDirMultiMenuActions.append(act) | 494 self.vcsDirMultiMenuActions.append(act) |
| 495 menu.addSeparator() | 495 menu.addSeparator() |
| 496 menu.addAction(self.trUtf8('Select all local file entries'), | 496 menu.addAction(self.trUtf8('Select all local file entries'), |
| 508 self.menuDirMulti = menu | 508 self.menuDirMulti = menu |
| 509 | 509 |
| 510 ############################################################################ | 510 ############################################################################ |
| 511 # Menu handling methods below | 511 # Menu handling methods below |
| 512 ############################################################################ | 512 ############################################################################ |
| 513 | |
| 514 def __HgRevert(self): | |
| 515 """ | |
| 516 Protected slot called by the context menu to revert changes made. | |
| 517 """ | |
| 518 names = [] | |
| 519 for itm in self.browser.getSelectedItems(): | |
| 520 try: | |
| 521 name = itm.fileName() | |
| 522 except AttributeError: | |
| 523 name = itm.dirName() | |
| 524 names.append(name) | |
| 525 self.vcs.hgRevert(names) | |
| 513 | 526 |
| 514 def __HgCopy(self): | 527 def __HgCopy(self): |
| 515 """ | 528 """ |
| 516 Private slot called by the context menu to copy the selected file. | 529 Private slot called by the context menu to copy the selected file. |
| 517 """ | 530 """ |
