Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
Plugins/VcsPlugins/vcsPySvn/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') |
| 296 """<p>This switches the local copy to another tag/branch.</p>""" | 282 """<p>This switches the local copy to another tag/branch.</p>""" |
| 297 )) | 283 )) |
| 298 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) | 284 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) |
| 299 self.actions.append(self.vcsSwitchAct) | 285 self.actions.append(self.vcsSwitchAct) |
| 300 | 286 |
| 301 # TODO: rename to "Conflicts resolved" | 287 self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), |
| 302 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), | 288 self.trUtf8('Con&flicts resolved'), |
| 303 self.trUtf8('Resolve con&flicts'), | |
| 304 0, 0, self, 'subversion_resolve') | 289 0, 0, self, 'subversion_resolve') |
| 305 self.vcsResolveAct.setStatusTip(self.trUtf8( | 290 self.vcsResolveAct.setStatusTip(self.trUtf8( |
| 306 'Resolve all conflicts of the local project' | 291 'Mark all conflicts of the local project as resolved' |
| 307 )) | 292 )) |
| 308 self.vcsResolveAct.setWhatsThis(self.trUtf8( | 293 self.vcsResolveAct.setWhatsThis(self.trUtf8( |
| 309 """<b>Resolve conflicts</b>""" | 294 """<b>Conflicts resolved</b>""" |
| 310 """<p>This resolves all conflicts of the local project.</p>""" | 295 """<p>This marks all conflicts of the local project as resolved.</p>""" |
| 311 )) | 296 )) |
| 312 self.vcsResolveAct.triggered[()].connect(self.__svnResolve) | 297 self.vcsResolveAct.triggered[()].connect(self.__svnResolve) |
| 313 self.actions.append(self.vcsResolveAct) | 298 self.actions.append(self.vcsResolveAct) |
| 314 | 299 |
| 315 self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), | 300 self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), |
| 478 menu.addAction(self.vcsCommitAct) | 463 menu.addAction(self.vcsCommitAct) |
| 479 menu.addSeparator() | 464 menu.addSeparator() |
| 480 menu.addAction(self.vcsNewAct) | 465 menu.addAction(self.vcsNewAct) |
| 481 menu.addAction(self.vcsExportAct) | 466 menu.addAction(self.vcsExportAct) |
| 482 menu.addSeparator() | 467 menu.addSeparator() |
| 483 menu.addAction(self.vcsAddAct) | |
| 484 menu.addAction(self.vcsRemoveAct) | 468 menu.addAction(self.vcsRemoveAct) |
| 485 menu.addSeparator() | 469 menu.addSeparator() |
| 486 menu.addAction(self.vcsTagAct) | 470 menu.addAction(self.vcsTagAct) |
| 487 if self.vcs.otherData["standardLayout"]: | 471 if self.vcs.otherData["standardLayout"]: |
| 488 menu.addAction(self.svnTagListAct) | 472 menu.addAction(self.svnTagListAct) |
