Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- branch
- Py2 comp.
- changeset 3515
- 1b8381afe38f
- parent 3484
- 645c12de6b0c
- parent 3471
- 31a6d4300906
- child 3586
- 6e3a6c5b58bf
equal
deleted
inserted
replaced
| 3506:d85fadb263a0 | 3515:1b8381afe38f |
|---|---|
| 323 self.tr('Show status'), self._VCSStatus) | 323 self.tr('Show status'), self._VCSStatus) |
| 324 self.vcsMenuActions.append(act) | 324 self.vcsMenuActions.append(act) |
| 325 menu.addSeparator() | 325 menu.addSeparator() |
| 326 act = menu.addAction( | 326 act = menu.addAction( |
| 327 UI.PixmapCache.getIcon("vcsDiff.png"), | 327 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 328 self.tr('Show difference'), self._VCSDiff) | 328 self.tr('Show differences'), self._VCSDiff) |
| 329 self.vcsMenuActions.append(act) | 329 self.vcsMenuActions.append(act) |
| 330 act = menu.addAction( | 330 act = menu.addAction( |
| 331 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 331 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 332 self.tr('Show difference side-by-side'), self.__HgSbsDiff) | 332 self.tr('Show differences side-by-side'), self.__HgSbsDiff) |
| 333 self.vcsMenuActions.append(act) | 333 self.vcsMenuActions.append(act) |
| 334 act = menu.addAction( | 334 act = menu.addAction( |
| 335 UI.PixmapCache.getIcon("vcsDiff.png"), | 335 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 336 self.tr('Show difference (extended)'), | 336 self.tr('Show differences (extended)'), |
| 337 self.__HgExtendedDiff) | 337 self.__HgExtendedDiff) |
| 338 self.vcsMenuActions.append(act) | 338 self.vcsMenuActions.append(act) |
| 339 act = menu.addAction( | 339 act = menu.addAction( |
| 340 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 340 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 341 self.tr('Show difference side-by-side (extended)'), | 341 self.tr('Show differences side-by-side (extended)'), |
| 342 self.__HgSbsExtendedDiff) | 342 self.__HgSbsExtendedDiff) |
| 343 self.vcsMenuActions.append(act) | 343 self.vcsMenuActions.append(act) |
| 344 self.annotateAct = menu.addAction( | 344 self.annotateAct = menu.addAction( |
| 345 self.tr('Show annotated file'), | 345 self.tr('Show annotated file'), |
| 346 self.__HgAnnotate) | 346 self.__HgAnnotate) |
| 349 act = menu.addAction( | 349 act = menu.addAction( |
| 350 UI.PixmapCache.getIcon("vcsRevert.png"), | 350 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 351 self.tr('Revert changes'), self.__HgRevert) | 351 self.tr('Revert changes'), self.__HgRevert) |
| 352 self.vcsMenuActions.append(act) | 352 self.vcsMenuActions.append(act) |
| 353 act = menu.addAction( | 353 act = menu.addAction( |
| 354 self.tr('Conflict resolved'), self.__HgResolve) | 354 self.tr('Conflicts resolved'), self.__HgResolve) |
| 355 self.vcsMenuActions.append(act) | 355 self.vcsMenuActions.append(act) |
| 356 menu.addSeparator() | 356 menu.addSeparator() |
| 357 menu.addAction(self.tr('Select all local file entries'), | 357 menu.addAction(self.tr('Select all local file entries'), |
| 358 self.browser.selectLocalEntries) | 358 self.browser.selectLocalEntries) |
| 359 menu.addAction(self.tr('Select all versioned file entries'), | 359 menu.addAction(self.tr('Select all versioned file entries'), |
| 417 self.tr('Show status'), self._VCSStatus) | 417 self.tr('Show status'), self._VCSStatus) |
| 418 self.vcsMultiMenuActions.append(act) | 418 self.vcsMultiMenuActions.append(act) |
| 419 menu.addSeparator() | 419 menu.addSeparator() |
| 420 act = menu.addAction( | 420 act = menu.addAction( |
| 421 UI.PixmapCache.getIcon("vcsDiff.png"), | 421 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 422 self.tr('Show difference'), self._VCSDiff) | 422 self.tr('Show differences'), self._VCSDiff) |
| 423 self.vcsMultiMenuActions.append(act) | 423 self.vcsMultiMenuActions.append(act) |
| 424 act = menu.addAction( | 424 act = menu.addAction( |
| 425 UI.PixmapCache.getIcon("vcsDiff.png"), | 425 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 426 self.tr('Show difference (extended)'), | 426 self.tr('Show differences (extended)'), |
| 427 self.__HgExtendedDiff) | 427 self.__HgExtendedDiff) |
| 428 self.vcsMultiMenuActions.append(act) | 428 self.vcsMultiMenuActions.append(act) |
| 429 menu.addSeparator() | 429 menu.addSeparator() |
| 430 act = menu.addAction( | 430 act = menu.addAction( |
| 431 UI.PixmapCache.getIcon("vcsRevert.png"), | 431 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 432 self.tr('Revert changes'), self.__HgRevert) | 432 self.tr('Revert changes'), self.__HgRevert) |
| 433 self.vcsMultiMenuActions.append(act) | 433 self.vcsMultiMenuActions.append(act) |
| 434 act = menu.addAction( | 434 act = menu.addAction( |
| 435 self.tr('Conflict resolved'), self.__HgResolve) | 435 self.tr('Conflicts resolved'), self.__HgResolve) |
| 436 self.vcsMultiMenuActions.append(act) | 436 self.vcsMultiMenuActions.append(act) |
| 437 menu.addSeparator() | 437 menu.addSeparator() |
| 438 menu.addAction(self.tr('Select all local file entries'), | 438 menu.addAction(self.tr('Select all local file entries'), |
| 439 self.browser.selectLocalEntries) | 439 self.browser.selectLocalEntries) |
| 440 menu.addAction(self.tr('Select all versioned file entries'), | 440 menu.addAction(self.tr('Select all versioned file entries'), |
| 541 self.tr('Show status'), self._VCSStatus) | 541 self.tr('Show status'), self._VCSStatus) |
| 542 self.vcsDirMenuActions.append(act) | 542 self.vcsDirMenuActions.append(act) |
| 543 menu.addSeparator() | 543 menu.addSeparator() |
| 544 act = menu.addAction( | 544 act = menu.addAction( |
| 545 UI.PixmapCache.getIcon("vcsDiff.png"), | 545 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 546 self.tr('Show difference'), self._VCSDiff) | 546 self.tr('Show differences'), self._VCSDiff) |
| 547 self.vcsDirMenuActions.append(act) | 547 self.vcsDirMenuActions.append(act) |
| 548 act = menu.addAction( | 548 act = menu.addAction( |
| 549 UI.PixmapCache.getIcon("vcsDiff.png"), | 549 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 550 self.tr('Show difference (extended)'), | 550 self.tr('Show differences (extended)'), |
| 551 self.__HgExtendedDiff) | 551 self.__HgExtendedDiff) |
| 552 self.vcsDirMenuActions.append(act) | 552 self.vcsDirMenuActions.append(act) |
| 553 menu.addSeparator() | 553 menu.addSeparator() |
| 554 act = menu.addAction( | 554 act = menu.addAction( |
| 555 UI.PixmapCache.getIcon("vcsRevert.png"), | 555 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 556 self.tr('Revert changes'), self.__HgRevert) | 556 self.tr('Revert changes'), self.__HgRevert) |
| 557 self.vcsDirMenuActions.append(act) | 557 self.vcsDirMenuActions.append(act) |
| 558 act = menu.addAction( | 558 act = menu.addAction( |
| 559 self.tr('Conflict resolved'), self.__HgResolve) | 559 self.tr('Conflicts resolved'), self.__HgResolve) |
| 560 self.vcsDirMenuActions.append(act) | 560 self.vcsDirMenuActions.append(act) |
| 561 menu.addSeparator() | 561 menu.addSeparator() |
| 562 menu.addAction(self.tr('Select all local file entries'), | 562 menu.addAction(self.tr('Select all local file entries'), |
| 563 self.browser.selectLocalEntries) | 563 self.browser.selectLocalEntries) |
| 564 menu.addAction(self.tr('Select all versioned file entries'), | 564 menu.addAction(self.tr('Select all versioned file entries'), |
| 619 self.tr('Show status'), self._VCSStatus) | 619 self.tr('Show status'), self._VCSStatus) |
| 620 self.vcsDirMultiMenuActions.append(act) | 620 self.vcsDirMultiMenuActions.append(act) |
| 621 menu.addSeparator() | 621 menu.addSeparator() |
| 622 act = menu.addAction( | 622 act = menu.addAction( |
| 623 UI.PixmapCache.getIcon("vcsDiff.png"), | 623 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 624 self.tr('Show difference'), self._VCSDiff) | 624 self.tr('Show differences'), self._VCSDiff) |
| 625 self.vcsDirMultiMenuActions.append(act) | 625 self.vcsDirMultiMenuActions.append(act) |
| 626 act = menu.addAction( | 626 act = menu.addAction( |
| 627 UI.PixmapCache.getIcon("vcsDiff.png"), | 627 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 628 self.tr('Show difference (extended)'), | 628 self.tr('Show differences (extended)'), |
| 629 self.__HgExtendedDiff) | 629 self.__HgExtendedDiff) |
| 630 self.vcsDirMultiMenuActions.append(act) | 630 self.vcsDirMultiMenuActions.append(act) |
| 631 menu.addSeparator() | 631 menu.addSeparator() |
| 632 act = menu.addAction( | 632 act = menu.addAction( |
| 633 UI.PixmapCache.getIcon("vcsRevert.png"), | 633 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 634 self.tr('Revert changes'), self.__HgRevert) | 634 self.tr('Revert changes'), self.__HgRevert) |
| 635 self.vcsDirMultiMenuActions.append(act) | 635 self.vcsDirMultiMenuActions.append(act) |
| 636 act = menu.addAction( | 636 act = menu.addAction( |
| 637 self.tr('Conflict resolved'), self.__HgResolve) | 637 self.tr('Conflicts resolved'), self.__HgResolve) |
| 638 self.vcsDirMultiMenuActions.append(act) | 638 self.vcsDirMultiMenuActions.append(act) |
| 639 menu.addSeparator() | 639 menu.addSeparator() |
| 640 menu.addAction(self.tr('Select all local file entries'), | 640 menu.addAction(self.tr('Select all local file entries'), |
| 641 self.browser.selectLocalEntries) | 641 self.browser.selectLocalEntries) |
| 642 menu.addAction(self.tr('Select all versioned file entries'), | 642 menu.addAction(self.tr('Select all versioned file entries'), |
