Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- branch
- 5_1_x
- changeset 1271
- 1e22e0168561
- parent 791
- 9ec2ac20e54e
- child 1510
- e75ecf2bd9dd
equal
deleted
inserted
replaced
| 1270:e1a56c0c0b60 | 1271:1e22e0168561 |
|---|---|
| 228 menu.addSeparator() | 228 menu.addSeparator() |
| 229 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) | 229 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) |
| 230 self.vcsMenuActions.append(act) | 230 self.vcsMenuActions.append(act) |
| 231 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) | 231 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) |
| 232 self.vcsMenuActions.append(act) | 232 self.vcsMenuActions.append(act) |
| 233 if self.vcs.versionStr >= '1.5.0': | 233 if self.vcs.version >= (1, 5, 0): |
| 234 menu.addSeparator() | 234 menu.addSeparator() |
| 235 act = menu.addAction(self.trUtf8("Add to Changelist"), | 235 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 236 self.__SVNAddToChangelist) | 236 self.__SVNAddToChangelist) |
| 237 self.vcsMenuActions.append(act) | 237 self.vcsMenuActions.append(act) |
| 238 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 238 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
| 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 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 278 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) |
| 279 self.vcsMenuActions.append(act) | 279 self.vcsMenuActions.append(act) |
| 280 if self.vcs.versionStr >= '1.2.0': | 280 if self.vcs.version >= (1, 2, 0): |
| 281 menu.addSeparator() | 281 menu.addSeparator() |
| 282 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 282 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 283 self.trUtf8('Lock'), self.__SVNLock) | 283 self.trUtf8('Lock'), self.__SVNLock) |
| 284 self.vcsMenuActions.append(act) | 284 self.vcsMenuActions.append(act) |
| 285 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 285 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), |
| 353 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) | 353 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) |
| 354 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 354 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
| 355 self.trUtf8('Remove from repository (and disk)'), | 355 self.trUtf8('Remove from repository (and disk)'), |
| 356 self._VCSRemove) | 356 self._VCSRemove) |
| 357 self.vcsMultiMenuActions.append(act) | 357 self.vcsMultiMenuActions.append(act) |
| 358 if self.vcs.versionStr >= '1.5.0': | 358 if self.vcs.version >= (1, 5, 0): |
| 359 menu.addSeparator() | 359 menu.addSeparator() |
| 360 act = menu.addAction(self.trUtf8("Add to Changelist"), | 360 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 361 self.__SVNAddToChangelist) | 361 self.__SVNAddToChangelist) |
| 362 self.vcsMenuActions.append(act) | 362 self.vcsMenuActions.append(act) |
| 363 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 363 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
| 383 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 383 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 384 self.trUtf8('Revert changes'), self._VCSRevert) | 384 self.trUtf8('Revert changes'), self._VCSRevert) |
| 385 self.vcsMultiMenuActions.append(act) | 385 self.vcsMultiMenuActions.append(act) |
| 386 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 386 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) |
| 387 self.vcsMultiMenuActions.append(act) | 387 self.vcsMultiMenuActions.append(act) |
| 388 if self.vcs.versionStr >= '1.2.0': | 388 if self.vcs.version >= (1, 2, 0): |
| 389 menu.addSeparator() | 389 menu.addSeparator() |
| 390 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 390 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 391 self.trUtf8('Lock'), self.__SVNLock) | 391 self.trUtf8('Lock'), self.__SVNLock) |
| 392 self.vcsMultiMenuActions.append(act) | 392 self.vcsMultiMenuActions.append(act) |
| 393 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), | 393 act = menu.addAction(UI.PixmapCache.getIcon("vcsUnlock.png"), |
| 495 menu.addSeparator() | 495 menu.addSeparator() |
| 496 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) | 496 act = menu.addAction(self.trUtf8('Copy in repository'), self.__SVNCopy) |
| 497 self.vcsDirMenuActions.append(act) | 497 self.vcsDirMenuActions.append(act) |
| 498 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) | 498 act = menu.addAction(self.trUtf8('Move in repository'), self.__SVNMove) |
| 499 self.vcsDirMenuActions.append(act) | 499 self.vcsDirMenuActions.append(act) |
| 500 if self.vcs.versionStr >= '1.5.0': | 500 if self.vcs.version >= (1, 5, 0): |
| 501 menu.addSeparator() | 501 menu.addSeparator() |
| 502 act = menu.addAction(self.trUtf8("Add to Changelist"), | 502 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 503 self.__SVNAddToChangelist) | 503 self.__SVNAddToChangelist) |
| 504 self.vcsMenuActions.append(act) | 504 self.vcsMenuActions.append(act) |
| 505 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 505 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
| 600 self.vcsAddDirMultiMenuActions.append(act) | 600 self.vcsAddDirMultiMenuActions.append(act) |
| 601 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), | 601 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
| 602 self.trUtf8('Remove from repository (and disk)'), | 602 self.trUtf8('Remove from repository (and disk)'), |
| 603 self._VCSRemove) | 603 self._VCSRemove) |
| 604 self.vcsDirMultiMenuActions.append(act) | 604 self.vcsDirMultiMenuActions.append(act) |
| 605 if self.vcs.versionStr >= '1.5.0': | 605 if self.vcs.version >= (1, 5, 0): |
| 606 menu.addSeparator() | 606 menu.addSeparator() |
| 607 act = menu.addAction(self.trUtf8("Add to Changelist"), | 607 act = menu.addAction(self.trUtf8("Add to Changelist"), |
| 608 self.__SVNAddToChangelist) | 608 self.__SVNAddToChangelist) |
| 609 self.vcsMenuActions.append(act) | 609 self.vcsMenuActions.append(act) |
| 610 act = menu.addAction(self.trUtf8("Remove from Changelist"), | 610 act = menu.addAction(self.trUtf8("Remove from Changelist"), |
