Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- changeset 1879
- 194a055fff04
- parent 1509
- c0b5e693b0eb
- child 1880
- dbd4d7698310
equal
deleted
inserted
replaced
| 1878:de889f485ae8 | 1879:194a055fff04 |
|---|---|
| 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 | 88 |
| 89 # TODO: remove this action from the menu | |
| 89 self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), | 90 self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), |
| 90 UI.PixmapCache.getIcon("vcsAdd.png"), | 91 UI.PixmapCache.getIcon("vcsAdd.png"), |
| 91 self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add') | 92 self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add') |
| 92 self.vcsAddAct.setStatusTip(self.trUtf8( | 93 self.vcsAddAct.setStatusTip(self.trUtf8( |
| 93 'Add the local project to the VCS repository' | 94 'Add the local project to the VCS repository' |
| 280 """<p>This switches the local copy to another tag/branch.</p>""" | 281 """<p>This switches the local copy to another tag/branch.</p>""" |
| 281 )) | 282 )) |
| 282 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) | 283 self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) |
| 283 self.actions.append(self.vcsSwitchAct) | 284 self.actions.append(self.vcsSwitchAct) |
| 284 | 285 |
| 286 # TODO: rename to "Conflicts resolved" | |
| 285 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), | 287 self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), |
| 286 self.trUtf8('Resolve con&flicts'), | 288 self.trUtf8('Resolve con&flicts'), |
| 287 0, 0, self, 'subversion_resolve') | 289 0, 0, self, 'subversion_resolve') |
| 288 self.vcsResolveAct.setStatusTip(self.trUtf8( | 290 self.vcsResolveAct.setStatusTip(self.trUtf8( |
| 289 'Resolve all conflicts of the local project' | 291 'Resolve all conflicts of the local project' |
