Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- changeset 1880
- dbd4d7698310
- parent 1879
- 194a055fff04
- child 1884
- 0a7ef7f4d09e
equal
deleted
inserted
replaced
| 1879:194a055fff04 | 1880:dbd4d7698310 |
|---|---|
| 268 self.trUtf8('Revert changes'), self._VCSRevert) | 268 self.trUtf8('Revert changes'), self._VCSRevert) |
| 269 self.vcsMenuActions.append(act) | 269 self.vcsMenuActions.append(act) |
| 270 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 270 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 271 self.trUtf8('Merge changes'), self._VCSMerge) | 271 self.trUtf8('Merge changes'), self._VCSMerge) |
| 272 self.vcsMenuActions.append(act) | 272 self.vcsMenuActions.append(act) |
| 273 # TODO: rename to "Conflict resolved (and subsequent occurrances)" | 273 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 274 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | |
| 275 self.vcsMenuActions.append(act) | 274 self.vcsMenuActions.append(act) |
| 276 if self.vcs.version >= (1, 2, 0): | 275 if self.vcs.version >= (1, 2, 0): |
| 277 menu.addSeparator() | 276 menu.addSeparator() |
| 278 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 277 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 279 self.trUtf8('Lock'), self.__SVNLock) | 278 self.trUtf8('Lock'), self.__SVNLock) |
| 377 self.vcsMultiMenuActions.append(act) | 376 self.vcsMultiMenuActions.append(act) |
| 378 menu.addSeparator() | 377 menu.addSeparator() |
| 379 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 378 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 380 self.trUtf8('Revert changes'), self._VCSRevert) | 379 self.trUtf8('Revert changes'), self._VCSRevert) |
| 381 self.vcsMultiMenuActions.append(act) | 380 self.vcsMultiMenuActions.append(act) |
| 382 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 381 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 383 self.vcsMultiMenuActions.append(act) | 382 self.vcsMultiMenuActions.append(act) |
| 384 if self.vcs.version >= (1, 2, 0): | 383 if self.vcs.version >= (1, 2, 0): |
| 385 menu.addSeparator() | 384 menu.addSeparator() |
| 386 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 385 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 387 self.trUtf8('Lock'), self.__SVNLock) | 386 self.trUtf8('Lock'), self.__SVNLock) |
| 529 self.trUtf8('Revert changes'), self._VCSRevert) | 528 self.trUtf8('Revert changes'), self._VCSRevert) |
| 530 self.vcsDirMenuActions.append(act) | 529 self.vcsDirMenuActions.append(act) |
| 531 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 530 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 532 self.trUtf8('Merge changes'), self._VCSMerge) | 531 self.trUtf8('Merge changes'), self._VCSMerge) |
| 533 self.vcsDirMenuActions.append(act) | 532 self.vcsDirMenuActions.append(act) |
| 534 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 533 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 535 self.vcsDirMenuActions.append(act) | 534 self.vcsDirMenuActions.append(act) |
| 536 menu.addSeparator() | 535 menu.addSeparator() |
| 537 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 536 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 538 self.vcsDirMenuActions.append(act) | 537 self.vcsDirMenuActions.append(act) |
| 539 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) | 538 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) |
| 623 self.trUtf8('Revert changes'), self._VCSRevert) | 622 self.trUtf8('Revert changes'), self._VCSRevert) |
| 624 self.vcsDirMultiMenuActions.append(act) | 623 self.vcsDirMultiMenuActions.append(act) |
| 625 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 624 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 626 self.trUtf8('Merge changes'), self._VCSMerge) | 625 self.trUtf8('Merge changes'), self._VCSMerge) |
| 627 self.vcsDirMultiMenuActions.append(act) | 626 self.vcsDirMultiMenuActions.append(act) |
| 628 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 627 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 629 self.vcsDirMultiMenuActions.append(act) | 628 self.vcsDirMultiMenuActions.append(act) |
| 630 menu.addSeparator() | 629 menu.addSeparator() |
| 631 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 630 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 632 self.vcsDirMultiMenuActions.append(act) | 631 self.vcsDirMultiMenuActions.append(act) |
| 633 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) | 632 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) |
