Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 1880
- dbd4d7698310
- parent 1879
- 194a055fff04
- child 1892
- ba56498a41e2
equal
deleted
inserted
replaced
| 1879:194a055fff04 | 1880:dbd4d7698310 |
|---|---|
| 217 """<p>This exports a project from the repository.</p>""" | 217 """<p>This exports a project from the repository.</p>""" |
| 218 )) | 218 )) |
| 219 self.vcsExportAct.triggered[()].connect(self._vcsExport) | 219 self.vcsExportAct.triggered[()].connect(self._vcsExport) |
| 220 self.actions.append(self.vcsExportAct) | 220 self.actions.append(self.vcsExportAct) |
| 221 | 221 |
| 222 # TODO: remove this action from the menu | |
| 223 self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), | |
| 224 UI.PixmapCache.getIcon("vcsAdd.png"), | |
| 225 self.trUtf8('&Add to repository...'), 0, 0, self, 'mercurial_add') | |
| 226 self.vcsAddAct.setStatusTip(self.trUtf8( | |
| 227 'Add the local project to the repository' | |
| 228 )) | |
| 229 self.vcsAddAct.setWhatsThis(self.trUtf8( | |
| 230 """<b>Add to repository</b>""" | |
| 231 """<p>This adds (imports) the local project to the repository.</p>""" | |
| 232 )) | |
| 233 self.vcsAddAct.triggered[()].connect(self._vcsImport) | |
| 234 self.actions.append(self.vcsAddAct) | |
| 235 | |
| 236 self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), | 222 self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), |
| 237 UI.PixmapCache.getIcon("vcsRemove.png"), | 223 UI.PixmapCache.getIcon("vcsRemove.png"), |
| 238 self.trUtf8('&Remove from repository (and disk)'), | 224 self.trUtf8('&Remove from repository (and disk)'), |
| 239 0, 0, self, 'mercurial_remove') | 225 0, 0, self, 'mercurial_remove') |
| 240 self.vcsRemoveAct.setStatusTip(self.trUtf8( | 226 self.vcsRemoveAct.setStatusTip(self.trUtf8( |
| 385 """<p>This merges changes of a revision into the local project.</p>""" | 371 """<p>This merges changes of a revision into the local project.</p>""" |
| 386 )) | 372 )) |
| 387 self.vcsMergeAct.triggered[()].connect(self._vcsMerge) | 373 self.vcsMergeAct.triggered[()].connect(self._vcsMerge) |
| 388 self.actions.append(self.vcsMergeAct) | 374 self.actions.append(self.vcsMergeAct) |
| 389 | 375 |
| 390 # TODO: rename to "Conflicts resolved" | 376 self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), |
| 391 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), | 377 self.trUtf8('Con&flicts resolved'), |
| 392 self.trUtf8('Resolve con&flicts'), | |
| 393 0, 0, self, 'mercurial_resolve') | 378 0, 0, self, 'mercurial_resolve') |
| 394 self.vcsResolveAct.setStatusTip(self.trUtf8( | 379 self.vcsResolveAct.setStatusTip(self.trUtf8( |
| 395 'Resolve all conflicts of the local project' | 380 'Mark all conflicts of the local project as resolved' |
| 396 )) | 381 )) |
| 397 self.vcsResolveAct.setWhatsThis(self.trUtf8( | 382 self.vcsResolveAct.setWhatsThis(self.trUtf8( |
| 398 """<b>Resolve conflicts</b>""" | 383 """<b>Conflicts resolved</b>""" |
| 399 """<p>This resolves all conflicts of the local project.</p>""" | 384 """<p>This marks all conflicts of the local project as resolved.</p>""" |
| 400 )) | 385 )) |
| 401 self.vcsResolveAct.triggered[()].connect(self.__hgResolve) | 386 self.vcsResolveAct.triggered[()].connect(self.__hgResolve) |
| 402 self.actions.append(self.vcsResolveAct) | 387 self.actions.append(self.vcsResolveAct) |
| 403 | 388 |
| 404 self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), | 389 self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), |
| 1002 menu.addMenu(self.__extensionsMenu) | 987 menu.addMenu(self.__extensionsMenu) |
| 1003 menu.addSeparator() | 988 menu.addSeparator() |
| 1004 menu.addAction(self.vcsNewAct) | 989 menu.addAction(self.vcsNewAct) |
| 1005 menu.addAction(self.vcsExportAct) | 990 menu.addAction(self.vcsExportAct) |
| 1006 menu.addSeparator() | 991 menu.addSeparator() |
| 1007 menu.addAction(self.vcsAddAct) | |
| 1008 menu.addAction(self.vcsRemoveAct) | 992 menu.addAction(self.vcsRemoveAct) |
| 1009 menu.addSeparator() | 993 menu.addSeparator() |
| 1010 menu.addAction(self.vcsTagAct) | 994 menu.addAction(self.vcsTagAct) |
| 1011 menu.addAction(self.hgTagListAct) | 995 menu.addAction(self.hgTagListAct) |
| 1012 menu.addAction(self.hgBranchAct) | 996 menu.addAction(self.hgBranchAct) |
