Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 1879
- 194a055fff04
- parent 1655
- d2b583fdde1c
- child 1880
- dbd4d7698310
equal
deleted
inserted
replaced
| 1878:de889f485ae8 | 1879:194a055fff04 |
|---|---|
| 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 | |
| 222 self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), | 223 self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), |
| 223 UI.PixmapCache.getIcon("vcsAdd.png"), | 224 UI.PixmapCache.getIcon("vcsAdd.png"), |
| 224 self.trUtf8('&Add to repository...'), 0, 0, self, 'mercurial_add') | 225 self.trUtf8('&Add to repository...'), 0, 0, self, 'mercurial_add') |
| 225 self.vcsAddAct.setStatusTip(self.trUtf8( | 226 self.vcsAddAct.setStatusTip(self.trUtf8( |
| 226 'Add the local project to the repository' | 227 'Add the local project to the repository' |
| 383 """<b>Merge</b>""" | 384 """<b>Merge</b>""" |
| 384 """<p>This merges changes of a revision into the local project.</p>""" | 385 """<p>This merges changes of a revision into the local project.</p>""" |
| 385 )) | 386 )) |
| 386 self.vcsMergeAct.triggered[()].connect(self._vcsMerge) | 387 self.vcsMergeAct.triggered[()].connect(self._vcsMerge) |
| 387 self.actions.append(self.vcsMergeAct) | 388 self.actions.append(self.vcsMergeAct) |
| 388 | 389 |
| 390 # TODO: rename to "Conflicts resolved" | |
| 389 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), | 391 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), |
| 390 self.trUtf8('Resolve con&flicts'), | 392 self.trUtf8('Resolve con&flicts'), |
| 391 0, 0, self, 'mercurial_resolve') | 393 0, 0, self, 'mercurial_resolve') |
| 392 self.vcsResolveAct.setStatusTip(self.trUtf8( | 394 self.vcsResolveAct.setStatusTip(self.trUtf8( |
| 393 'Resolve all conflicts of the local project' | 395 'Resolve all conflicts of the local project' |
