Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- changeset 1880
- dbd4d7698310
- parent 1879
- 194a055fff04
- child 1884
- 0a7ef7f4d09e
equal
deleted
inserted
replaced
| 1879:194a055fff04 | 1880:dbd4d7698310 |
|---|---|
| 273 self.trUtf8('Revert changes'), self._VCSRevert) | 273 self.trUtf8('Revert changes'), self._VCSRevert) |
| 274 self.vcsMenuActions.append(act) | 274 self.vcsMenuActions.append(act) |
| 275 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 275 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 276 self.trUtf8('Merge changes'), self._VCSMerge) | 276 self.trUtf8('Merge changes'), self._VCSMerge) |
| 277 self.vcsMenuActions.append(act) | 277 self.vcsMenuActions.append(act) |
| 278 # TODO: rename to "Conflict resolved (and subsequent occurrances)" | 278 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 279 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | |
| 280 self.vcsMenuActions.append(act) | 279 self.vcsMenuActions.append(act) |
| 281 menu.addSeparator() | 280 menu.addSeparator() |
| 282 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 281 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 283 self.trUtf8('Lock'), self.__SVNLock) | 282 self.trUtf8('Lock'), self.__SVNLock) |
| 284 self.vcsMenuActions.append(act) | 283 self.vcsMenuActions.append(act) |
| 381 self.vcsMultiMenuActions.append(act) | 380 self.vcsMultiMenuActions.append(act) |
| 382 menu.addSeparator() | 381 menu.addSeparator() |
| 383 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 382 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 384 self.trUtf8('Revert changes'), self._VCSRevert) | 383 self.trUtf8('Revert changes'), self._VCSRevert) |
| 385 self.vcsMultiMenuActions.append(act) | 384 self.vcsMultiMenuActions.append(act) |
| 386 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 385 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 387 self.vcsMultiMenuActions.append(act) | 386 self.vcsMultiMenuActions.append(act) |
| 388 menu.addSeparator() | 387 menu.addSeparator() |
| 389 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 388 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 390 self.trUtf8('Lock'), self.__SVNLock) | 389 self.trUtf8('Lock'), self.__SVNLock) |
| 391 self.vcsMultiMenuActions.append(act) | 390 self.vcsMultiMenuActions.append(act) |
| 535 self.trUtf8('Revert changes'), self._VCSRevert) | 534 self.trUtf8('Revert changes'), self._VCSRevert) |
| 536 self.vcsDirMenuActions.append(act) | 535 self.vcsDirMenuActions.append(act) |
| 537 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 536 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 538 self.trUtf8('Merge changes'), self._VCSMerge) | 537 self.trUtf8('Merge changes'), self._VCSMerge) |
| 539 self.vcsDirMenuActions.append(act) | 538 self.vcsDirMenuActions.append(act) |
| 540 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 539 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 541 self.vcsDirMenuActions.append(act) | 540 self.vcsDirMenuActions.append(act) |
| 542 menu.addSeparator() | 541 menu.addSeparator() |
| 543 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 542 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 544 self.vcsDirMenuActions.append(act) | 543 self.vcsDirMenuActions.append(act) |
| 545 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) | 544 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) |
| 629 self.trUtf8('Revert changes'), self._VCSRevert) | 628 self.trUtf8('Revert changes'), self._VCSRevert) |
| 630 self.vcsDirMultiMenuActions.append(act) | 629 self.vcsDirMultiMenuActions.append(act) |
| 631 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 630 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 632 self.trUtf8('Merge changes'), self._VCSMerge) | 631 self.trUtf8('Merge changes'), self._VCSMerge) |
| 633 self.vcsDirMultiMenuActions.append(act) | 632 self.vcsDirMultiMenuActions.append(act) |
| 634 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 633 act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) |
| 635 self.vcsDirMultiMenuActions.append(act) | 634 self.vcsDirMultiMenuActions.append(act) |
| 636 menu.addSeparator() | 635 menu.addSeparator() |
| 637 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 636 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 638 self.vcsDirMultiMenuActions.append(act) | 637 self.vcsDirMultiMenuActions.append(act) |
| 639 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) | 638 act = menu.addAction(self.trUtf8('List Properties'), self.__SVNListProps) |
