Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- branch
- Py2 comp.
- changeset 3515
- 1b8381afe38f
- parent 3484
- 645c12de6b0c
- parent 3471
- 31a6d4300906
- child 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3506:d85fadb263a0 | 3515:1b8381afe38f |
|---|---|
| 263 self.tr('Show status'), self._VCSStatus) | 263 self.tr('Show status'), self._VCSStatus) |
| 264 self.vcsMenuActions.append(act) | 264 self.vcsMenuActions.append(act) |
| 265 menu.addSeparator() | 265 menu.addSeparator() |
| 266 act = menu.addAction( | 266 act = menu.addAction( |
| 267 UI.PixmapCache.getIcon("vcsDiff.png"), | 267 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 268 self.tr('Show difference'), self._VCSDiff) | 268 self.tr('Show differences'), self._VCSDiff) |
| 269 self.vcsMenuActions.append(act) | 269 self.vcsMenuActions.append(act) |
| 270 act = menu.addAction( | 270 act = menu.addAction( |
| 271 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 271 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 272 self.tr('Show difference side-by-side'), self.__SVNSbsDiff) | 272 self.tr('Show differences side-by-side'), self.__SVNSbsDiff) |
| 273 self.vcsMenuActions.append(act) | 273 self.vcsMenuActions.append(act) |
| 274 act = menu.addAction( | 274 act = menu.addAction( |
| 275 UI.PixmapCache.getIcon("vcsDiff.png"), | 275 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 276 self.tr('Show difference (extended)'), | 276 self.tr('Show differences (extended)'), |
| 277 self.__SVNExtendedDiff) | 277 self.__SVNExtendedDiff) |
| 278 self.vcsMenuActions.append(act) | 278 self.vcsMenuActions.append(act) |
| 279 act = menu.addAction( | 279 act = menu.addAction( |
| 280 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 280 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 281 self.tr('Show difference side-by-side (extended)'), | 281 self.tr('Show differences side-by-side (extended)'), |
| 282 self.__SVNSbsExtendedDiff) | 282 self.__SVNSbsExtendedDiff) |
| 283 self.vcsMenuActions.append(act) | 283 self.vcsMenuActions.append(act) |
| 284 act = menu.addAction( | 284 act = menu.addAction( |
| 285 UI.PixmapCache.getIcon("vcsDiff.png"), | 285 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 286 self.tr('Show difference (URLs)'), | 286 self.tr('Show differences (URLs)'), |
| 287 self.__SVNUrlDiff) | 287 self.__SVNUrlDiff) |
| 288 self.vcsMenuActions.append(act) | 288 self.vcsMenuActions.append(act) |
| 289 self.blameAct = menu.addAction( | 289 self.blameAct = menu.addAction( |
| 290 self.tr('Show annotated file'), | 290 self.tr('Show annotated file'), |
| 291 self.__SVNBlame) | 291 self.__SVNBlame) |
| 298 act = menu.addAction( | 298 act = menu.addAction( |
| 299 UI.PixmapCache.getIcon("vcsMerge.png"), | 299 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 300 self.tr('Merge changes'), self._VCSMerge) | 300 self.tr('Merge changes'), self._VCSMerge) |
| 301 self.vcsMenuActions.append(act) | 301 self.vcsMenuActions.append(act) |
| 302 act = menu.addAction( | 302 act = menu.addAction( |
| 303 self.tr('Conflict resolved'), self.__SVNResolve) | 303 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 304 self.vcsMenuActions.append(act) | 304 self.vcsMenuActions.append(act) |
| 305 if self.vcs.version >= (1, 2, 0): | 305 if self.vcs.version >= (1, 2, 0): |
| 306 menu.addSeparator() | 306 menu.addSeparator() |
| 307 act = menu.addAction( | 307 act = menu.addAction( |
| 308 UI.PixmapCache.getIcon("vcsLock.png"), | 308 UI.PixmapCache.getIcon("vcsLock.png"), |
| 406 self.tr('Show status'), self._VCSStatus) | 406 self.tr('Show status'), self._VCSStatus) |
| 407 self.vcsMultiMenuActions.append(act) | 407 self.vcsMultiMenuActions.append(act) |
| 408 menu.addSeparator() | 408 menu.addSeparator() |
| 409 act = menu.addAction( | 409 act = menu.addAction( |
| 410 UI.PixmapCache.getIcon("vcsDiff.png"), | 410 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 411 self.tr('Show difference'), self._VCSDiff) | 411 self.tr('Show differences'), self._VCSDiff) |
| 412 self.vcsMultiMenuActions.append(act) | 412 self.vcsMultiMenuActions.append(act) |
| 413 act = menu.addAction( | 413 act = menu.addAction( |
| 414 UI.PixmapCache.getIcon("vcsDiff.png"), | 414 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 415 self.tr('Show difference (extended)'), | 415 self.tr('Show differences (extended)'), |
| 416 self.__SVNExtendedDiff) | 416 self.__SVNExtendedDiff) |
| 417 self.vcsMultiMenuActions.append(act) | 417 self.vcsMultiMenuActions.append(act) |
| 418 act = menu.addAction( | 418 act = menu.addAction( |
| 419 UI.PixmapCache.getIcon("vcsDiff.png"), | 419 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 420 self.tr('Show difference (URLs)'), | 420 self.tr('Show differences (URLs)'), |
| 421 self.__SVNUrlDiff) | 421 self.__SVNUrlDiff) |
| 422 self.vcsMultiMenuActions.append(act) | 422 self.vcsMultiMenuActions.append(act) |
| 423 menu.addSeparator() | 423 menu.addSeparator() |
| 424 act = menu.addAction( | 424 act = menu.addAction( |
| 425 UI.PixmapCache.getIcon("vcsRevert.png"), | 425 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 426 self.tr('Revert changes'), self._VCSRevert) | 426 self.tr('Revert changes'), self._VCSRevert) |
| 427 self.vcsMultiMenuActions.append(act) | 427 self.vcsMultiMenuActions.append(act) |
| 428 act = menu.addAction( | 428 act = menu.addAction( |
| 429 self.tr('Conflict resolved'), self.__SVNResolve) | 429 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 430 self.vcsMultiMenuActions.append(act) | 430 self.vcsMultiMenuActions.append(act) |
| 431 if self.vcs.version >= (1, 2, 0): | 431 if self.vcs.version >= (1, 2, 0): |
| 432 menu.addSeparator() | 432 menu.addSeparator() |
| 433 act = menu.addAction( | 433 act = menu.addAction( |
| 434 UI.PixmapCache.getIcon("vcsLock.png"), | 434 UI.PixmapCache.getIcon("vcsLock.png"), |
| 576 self.tr('Show status'), self._VCSStatus) | 576 self.tr('Show status'), self._VCSStatus) |
| 577 self.vcsDirMenuActions.append(act) | 577 self.vcsDirMenuActions.append(act) |
| 578 menu.addSeparator() | 578 menu.addSeparator() |
| 579 act = menu.addAction( | 579 act = menu.addAction( |
| 580 UI.PixmapCache.getIcon("vcsDiff.png"), | 580 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 581 self.tr('Show difference'), self._VCSDiff) | 581 self.tr('Show differences'), self._VCSDiff) |
| 582 self.vcsDirMenuActions.append(act) | 582 self.vcsDirMenuActions.append(act) |
| 583 act = menu.addAction( | 583 act = menu.addAction( |
| 584 UI.PixmapCache.getIcon("vcsDiff.png"), | 584 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 585 self.tr('Show difference (extended)'), | 585 self.tr('Show differences (extended)'), |
| 586 self.__SVNExtendedDiff) | 586 self.__SVNExtendedDiff) |
| 587 self.vcsDirMenuActions.append(act) | 587 self.vcsDirMenuActions.append(act) |
| 588 act = menu.addAction( | 588 act = menu.addAction( |
| 589 UI.PixmapCache.getIcon("vcsDiff.png"), | 589 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 590 self.tr('Show difference (URLs)'), | 590 self.tr('Show differences (URLs)'), |
| 591 self.__SVNUrlDiff) | 591 self.__SVNUrlDiff) |
| 592 self.vcsDirMenuActions.append(act) | 592 self.vcsDirMenuActions.append(act) |
| 593 menu.addSeparator() | 593 menu.addSeparator() |
| 594 act = menu.addAction( | 594 act = menu.addAction( |
| 595 UI.PixmapCache.getIcon("vcsRevert.png"), | 595 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 598 act = menu.addAction( | 598 act = menu.addAction( |
| 599 UI.PixmapCache.getIcon("vcsMerge.png"), | 599 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 600 self.tr('Merge changes'), self._VCSMerge) | 600 self.tr('Merge changes'), self._VCSMerge) |
| 601 self.vcsDirMenuActions.append(act) | 601 self.vcsDirMenuActions.append(act) |
| 602 act = menu.addAction( | 602 act = menu.addAction( |
| 603 self.tr('Conflict resolved'), self.__SVNResolve) | 603 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 604 self.vcsDirMenuActions.append(act) | 604 self.vcsDirMenuActions.append(act) |
| 605 menu.addSeparator() | 605 menu.addSeparator() |
| 606 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 606 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 607 self.vcsDirMenuActions.append(act) | 607 self.vcsDirMenuActions.append(act) |
| 608 act = menu.addAction( | 608 act = menu.addAction( |
| 685 self.tr('Show status'), self._VCSStatus) | 685 self.tr('Show status'), self._VCSStatus) |
| 686 self.vcsDirMultiMenuActions.append(act) | 686 self.vcsDirMultiMenuActions.append(act) |
| 687 menu.addSeparator() | 687 menu.addSeparator() |
| 688 act = menu.addAction( | 688 act = menu.addAction( |
| 689 UI.PixmapCache.getIcon("vcsDiff.png"), | 689 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 690 self.tr('Show difference'), self._VCSDiff) | 690 self.tr('Show differences'), self._VCSDiff) |
| 691 self.vcsDirMultiMenuActions.append(act) | 691 self.vcsDirMultiMenuActions.append(act) |
| 692 act = menu.addAction( | 692 act = menu.addAction( |
| 693 UI.PixmapCache.getIcon("vcsDiff.png"), | 693 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 694 self.tr('Show difference (extended)'), | 694 self.tr('Show differences (extended)'), |
| 695 self.__SVNExtendedDiff) | 695 self.__SVNExtendedDiff) |
| 696 self.vcsDirMultiMenuActions.append(act) | 696 self.vcsDirMultiMenuActions.append(act) |
| 697 act = menu.addAction( | 697 act = menu.addAction( |
| 698 UI.PixmapCache.getIcon("vcsDiff.png"), | 698 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 699 self.tr('Show difference (URLs)'), | 699 self.tr('Show differences (URLs)'), |
| 700 self.__SVNUrlDiff) | 700 self.__SVNUrlDiff) |
| 701 self.vcsDirMultiMenuActions.append(act) | 701 self.vcsDirMultiMenuActions.append(act) |
| 702 menu.addSeparator() | 702 menu.addSeparator() |
| 703 act = menu.addAction( | 703 act = menu.addAction( |
| 704 UI.PixmapCache.getIcon("vcsRevert.png"), | 704 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 707 act = menu.addAction( | 707 act = menu.addAction( |
| 708 UI.PixmapCache.getIcon("vcsMerge.png"), | 708 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 709 self.tr('Merge changes'), self._VCSMerge) | 709 self.tr('Merge changes'), self._VCSMerge) |
| 710 self.vcsDirMultiMenuActions.append(act) | 710 self.vcsDirMultiMenuActions.append(act) |
| 711 act = menu.addAction( | 711 act = menu.addAction( |
| 712 self.tr('Conflict resolved'), self.__SVNResolve) | 712 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 713 self.vcsDirMultiMenuActions.append(act) | 713 self.vcsDirMultiMenuActions.append(act) |
| 714 menu.addSeparator() | 714 menu.addSeparator() |
| 715 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 715 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 716 self.vcsDirMultiMenuActions.append(act) | 716 self.vcsDirMultiMenuActions.append(act) |
| 717 act = menu.addAction( | 717 act = menu.addAction( |
