Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- 5_4_x
- changeset 3275
- 186e0b3611b3
- parent 3245
- 48311fa7c52c
- child 3301
- 337e119a3bdf
equal
deleted
inserted
replaced
| 3274:f73cb16b37b4 | 3275:186e0b3611b3 |
|---|---|
| 1741 'The process {0} could not be started. ' | 1741 'The process {0} could not be started. ' |
| 1742 'Ensure, that it is in the search path.').format('hg') | 1742 'Ensure, that it is in the search path.').format('hg') |
| 1743 else: | 1743 else: |
| 1744 output, error = self.__client.runcommand(args) | 1744 output, error = self.__client.runcommand(args) |
| 1745 | 1745 |
| 1746 return output, error | 1746 # return file contents with 'universal newlines' |
| 1747 return output.replace('\r\n', '\n').replace('\r', '\n'), error | |
| 1747 | 1748 |
| 1748 def hgSbsDiff(self, name, extended=False, revisions=None): | 1749 def hgSbsDiff(self, name, extended=False, revisions=None): |
| 1749 """ | 1750 """ |
| 1750 Public method used to view the difference of a file to the Mercurial | 1751 Public method used to view the difference of a file to the Mercurial |
| 1751 repository side-by-side. | 1752 repository side-by-side. |
