Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- changeset 1880
- dbd4d7698310
- parent 1879
- 194a055fff04
- child 1888
- 03f59d88a62d
equal
deleted
inserted
replaced
| 1879:194a055fff04 | 1880:dbd4d7698310 |
|---|---|
| 83 """<b>Commit changes to repository</b>""" | 83 """<b>Commit changes to repository</b>""" |
| 84 """<p>This commits changes to the local project to the VCS repository.</p>""" | 84 """<p>This commits changes to the local project to the VCS repository.</p>""" |
| 85 )) | 85 )) |
| 86 self.vcsCommitAct.triggered[()].connect(self._vcsCommit) | 86 self.vcsCommitAct.triggered[()].connect(self._vcsCommit) |
| 87 self.actions.append(self.vcsCommitAct) | 87 self.actions.append(self.vcsCommitAct) |
| 88 | |
| 89 # TODO: remove this action from the menu | |
| 90 self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), | |
| 91 UI.PixmapCache.getIcon("vcsAdd.png"), | |
| 92 self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add') | |
| 93 self.vcsAddAct.setStatusTip(self.trUtf8( | |
| 94 'Add the local project to the VCS repository' | |
| 95 )) | |
| 96 self.vcsAddAct.setWhatsThis(self.trUtf8( | |
| 97 """<b>Add to repository</b>""" | |
| 98 """<p>This adds (imports) the local project to the VCS repository.</p>""" | |
| 99 )) | |
| 100 self.vcsAddAct.triggered[()].connect(self._vcsImport) | |
| 101 self.actions.append(self.vcsAddAct) | |
| 102 | 88 |
| 103 self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), | 89 self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), |
| 104 UI.PixmapCache.getIcon("vcsRemove.png"), | 90 UI.PixmapCache.getIcon("vcsRemove.png"), |
| 105 self.trUtf8('&Remove from repository (and disk)'), | 91 self.trUtf8('&Remove from repository (and disk)'), |
| 106 0, 0, self, 'subversion_remove') | 92 0, 0, self, 'subversion_remove') |
| 281 """<p>This switches the local copy to another tag/branch.</p>""" | 267 """<p>This switches the local copy to another tag/branch.</p>""" |
| 282 )) | 268 )) |
| 283 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) | 269 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) |
| 284 self.actions.append(self.vcsSwitchAct) | 270 self.actions.append(self.vcsSwitchAct) |
| 285 | 271 |
| 286 # TODO: rename to "Conflicts resolved" | 272 self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), |
| 287 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), | 273 self.trUtf8('Con&flicts resolved'), |
| 288 self.trUtf8('Resolve con&flicts'), | |
| 289 0, 0, self, 'subversion_resolve') | 274 0, 0, self, 'subversion_resolve') |
| 290 self.vcsResolveAct.setStatusTip(self.trUtf8( | 275 self.vcsResolveAct.setStatusTip(self.trUtf8( |
| 291 'Resolve all conflicts of the local project' | 276 'Mark all conflicts of the local project as resolved' |
| 292 )) | 277 )) |
| 293 self.vcsResolveAct.setWhatsThis(self.trUtf8( | 278 self.vcsResolveAct.setWhatsThis(self.trUtf8( |
| 294 """<b>Resolve conflicts</b>""" | 279 """<b>Conflicts resolved</b>""" |
| 295 """<p>This resolves all conflicts of the local project.</p>""" | 280 """<p>This marks all conflicts of the local project as resolved.</p>""" |
| 296 )) | 281 )) |
| 297 self.vcsResolveAct.triggered[()].connect(self.__svnResolve) | 282 self.vcsResolveAct.triggered[()].connect(self.__svnResolve) |
| 298 self.actions.append(self.vcsResolveAct) | 283 self.actions.append(self.vcsResolveAct) |
| 299 | 284 |
| 300 self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), | 285 self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), |
| 463 menu.addAction(self.vcsCommitAct) | 448 menu.addAction(self.vcsCommitAct) |
| 464 menu.addSeparator() | 449 menu.addSeparator() |
| 465 menu.addAction(self.vcsNewAct) | 450 menu.addAction(self.vcsNewAct) |
| 466 menu.addAction(self.vcsExportAct) | 451 menu.addAction(self.vcsExportAct) |
| 467 menu.addSeparator() | 452 menu.addSeparator() |
| 468 menu.addAction(self.vcsAddAct) | |
| 469 menu.addAction(self.vcsRemoveAct) | 453 menu.addAction(self.vcsRemoveAct) |
| 470 menu.addSeparator() | 454 menu.addSeparator() |
| 471 menu.addAction(self.vcsTagAct) | 455 menu.addAction(self.vcsTagAct) |
| 472 if self.vcs.otherData["standardLayout"]: | 456 if self.vcs.otherData["standardLayout"]: |
| 473 menu.addAction(self.svnTagListAct) | 457 menu.addAction(self.svnTagListAct) |
