Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py
- changeset 3008
- 7848489bcb92
- parent 2302
- f29e9405c851
- child 3020
- 542e97d4ecb3
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 3007:bad2e89047e7 | 3008:7848489bcb92 |
|---|---|
| 39 'Fetch changes from a remote repository' | 39 'Fetch changes from a remote repository' |
| 40 )) | 40 )) |
| 41 self.hgFetchAct.setWhatsThis(self.trUtf8( | 41 self.hgFetchAct.setWhatsThis(self.trUtf8( |
| 42 """<b>Fetch changes</b>""" | 42 """<b>Fetch changes</b>""" |
| 43 """<p>This pulls changes from a remote repository into the """ | 43 """<p>This pulls changes from a remote repository into the """ |
| 44 """local repository. If the pulled changes add a new branch head,""" | 44 """local repository. If the pulled changes add a new branch""" |
| 45 """ the head is automatically merged, and the result of the merge""" | 45 """ head, the head is automatically merged, and the result of""" |
| 46 """ is committed. Otherwise, the working directory is updated to""" | 46 """ the merge is committed. Otherwise, the working directory""" |
| 47 """ include the new changes.</p>""" | 47 """ is updated to include the new changes.</p>""" |
| 48 )) | 48 )) |
| 49 self.hgFetchAct.triggered[()].connect(self.__hgFetch) | 49 self.hgFetchAct.triggered[()].connect(self.__hgFetch) |
| 50 self.actions.append(self.hgFetchAct) | 50 self.actions.append(self.hgFetchAct) |
| 51 | 51 |
| 52 def initMenu(self, mainMenu): | 52 def initMenu(self, mainMenu): |
