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