Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- changeset 1268
- 4fc337f391c9
- parent 1267
- 5eddb59304c7
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 1267:5eddb59304c7 | 1268:4fc337f391c9 |
|---|---|
| 227 menu.addSeparator() | 227 menu.addSeparator() |
| 228 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) | 228 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) |
| 229 self.vcsMenuActions.append(act) | 229 self.vcsMenuActions.append(act) |
| 230 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) | 230 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) |
| 231 self.vcsMenuActions.append(act) | 231 self.vcsMenuActions.append(act) |
| 232 if self.vcs.versionStr >= '1.5.0': | 232 if self.vcs.version >= (1, 5, 0): |
| 233 menu.addSeparator() | 233 menu.addSeparator() |
| 234 act = menu.addAction(self.trUtf8("Add to Changelist"), | 234 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 235 self.__SVNAddToChangelist) | 235 self.__SVNAddToChangelist) |
| 236 self.vcsMenuActions.append(act) | 236 self.vcsMenuActions.append(act) |
| 237 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 237 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
| 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 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 273 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) |
| 274 self.vcsMenuActions.append(act) | 274 self.vcsMenuActions.append(act) |
| 275 if self.vcs.versionStr >= '1.2.0': | 275 if self.vcs.version >= (1, 2, 0): |
| 276 menu.addSeparator() | 276 menu.addSeparator() |
| 277 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 277 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 278 self.trUtf8('Lock'), self.__SVNLock) | 278 self.trUtf8('Lock'), self.__SVNLock) |
| 279 self.vcsMenuActions.append(act) | 279 self.vcsMenuActions.append(act) |
| 280 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 280 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), |
| 348 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) | 348 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) |
| 349 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 349 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
| 350 self.trUtf8('Remove from repository (and disk)'), | 350 self.trUtf8('Remove from repository (and disk)'), |
| 351 self._VCSRemove) | 351 self._VCSRemove) |
| 352 self.vcsMultiMenuActions.append(act) | 352 self.vcsMultiMenuActions.append(act) |
| 353 if self.vcs.versionStr >= '1.5.0': | 353 if self.vcs.version >= (1, 5, 0): |
| 354 menu.addSeparator() | 354 menu.addSeparator() |
| 355 act = menu.addAction(self.trUtf8("Add to Changelist"), | 355 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 356 self.__SVNAddToChangelist) | 356 self.__SVNAddToChangelist) |
| 357 self.vcsMenuActions.append(act) | 357 self.vcsMenuActions.append(act) |
| 358 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 358 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
| 378 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 378 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 379 self.trUtf8('Revert changes'), self._VCSRevert) | 379 self.trUtf8('Revert changes'), self._VCSRevert) |
| 380 self.vcsMultiMenuActions.append(act) | 380 self.vcsMultiMenuActions.append(act) |
| 381 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 381 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) |
| 382 self.vcsMultiMenuActions.append(act) | 382 self.vcsMultiMenuActions.append(act) |
| 383 if self.vcs.versionStr >= '1.2.0': | 383 if self.vcs.version >= (1, 2, 0): |
| 384 menu.addSeparator() | 384 menu.addSeparator() |
| 385 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 385 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 386 self.trUtf8('Lock'), self.__SVNLock) | 386 self.trUtf8('Lock'), self.__SVNLock) |
| 387 self.vcsMultiMenuActions.append(act) | 387 self.vcsMultiMenuActions.append(act) |
| 388 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 388 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), |
| 490 menu.addSeparator() | 490 menu.addSeparator() |
| 491 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) | 491 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) |
| 492 self.vcsDirMenuActions.append(act) | 492 self.vcsDirMenuActions.append(act) |
| 493 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) | 493 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) |
| 494 self.vcsDirMenuActions.append(act) | 494 self.vcsDirMenuActions.append(act) |
| 495 if self.vcs.versionStr >= '1.5.0': | 495 if self.vcs.version >= (1, 5, 0): |
| 496 menu.addSeparator() | 496 menu.addSeparator() |
| 497 act = menu.addAction(self.trUtf8("Add to Changelist"), | 497 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 498 self.__SVNAddToChangelist) | 498 self.__SVNAddToChangelist) |
| 499 self.vcsMenuActions.append(act) | 499 self.vcsMenuActions.append(act) |
| 500 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 500 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
| 591 self.vcsAddDirMultiMenuActions.append(act) | 591 self.vcsAddDirMultiMenuActions.append(act) |
| 592 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 592 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
| 593 self.trUtf8('Remove from repository (and disk)'), | 593 self.trUtf8('Remove from repository (and disk)'), |
| 594 self._VCSRemove) | 594 self._VCSRemove) |
| 595 self.vcsDirMultiMenuActions.append(act) | 595 self.vcsDirMultiMenuActions.append(act) |
| 596 if self.vcs.versionStr >= '1.5.0': | 596 if self.vcs.version >= (1, 5, 0): |
| 597 menu.addSeparator() | 597 menu.addSeparator() |
| 598 act = menu.addAction(self.trUtf8("Add to Changelist"), | 598 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 599 self.__SVNAddToChangelist) | 599 self.__SVNAddToChangelist) |
| 600 self.vcsMenuActions.append(act) | 600 self.vcsMenuActions.append(act) |
| 601 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 601 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
