Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 2843
- d4142608cffc
- parent 2842
- 8dfee488b176
- child 2844
- a61ee61b1c2c
equal
deleted
inserted
replaced
| 2842:8dfee488b176 | 2843:d4142608cffc |
|---|---|
| 1743 self.trUtf8("Mercurial Side-by-Side Difference"), | 1743 self.trUtf8("Mercurial Side-by-Side Difference"), |
| 1744 self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") | 1744 self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") |
| 1745 .format(name)) | 1745 .format(name)) |
| 1746 return | 1746 return |
| 1747 | 1747 |
| 1748 if output1 and output2: | 1748 if self.sbsDiff is None: |
| 1749 if self.sbsDiff is None: | 1749 from UI.CompareDialog import CompareDialog |
| 1750 from UI.CompareDialog import CompareDialog | 1750 self.sbsDiff = CompareDialog() |
| 1751 self.sbsDiff = CompareDialog() | 1751 self.sbsDiff.show() |
| 1752 self.sbsDiff.show() | 1752 self.sbsDiff.compare(output1, output2, name1, name2) |
| 1753 self.sbsDiff.compare(output1, output2, name1, name2) | |
| 1754 | 1753 |
| 1755 def hgLogBrowser(self, path, isFile=False): | 1754 def hgLogBrowser(self, path, isFile=False): |
| 1756 """ | 1755 """ |
| 1757 Public method used to browse the log of a file/directory from the | 1756 Public method used to browse the log of a file/directory from the |
| 1758 Mercurial repository. | 1757 Mercurial repository. |
