Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3276
- 1b7002ea389d
- parent 3260
- 37bbdfba30bc
- child 3277
- b7d9c75223e3
equal
deleted
inserted
replaced
| 3273:075758282fdb | 3276:1b7002ea389d |
|---|---|
| 1773 'The process {0} could not be started. ' | 1773 'The process {0} could not be started. ' |
| 1774 'Ensure, that it is in the search path.').format('hg') | 1774 'Ensure, that it is in the search path.').format('hg') |
| 1775 else: | 1775 else: |
| 1776 output, error = self.__client.runcommand(args) | 1776 output, error = self.__client.runcommand(args) |
| 1777 | 1777 |
| 1778 return output, error | 1778 # return file contents with 'universal newlines' |
| 1779 return output.replace('\r\n', '\n').replace('\r', '\n'), error | |
| 1779 | 1780 |
| 1780 def hgSbsDiff(self, name, extended=False, revisions=None): | 1781 def hgSbsDiff(self, name, extended=False, revisions=None): |
| 1781 """ | 1782 """ |
| 1782 Public method used to view the difference of a file to the Mercurial | 1783 Public method used to view the difference of a file to the Mercurial |
| 1783 repository side-by-side. | 1784 repository side-by-side. |
