Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 2844
- a61ee61b1c2c
- parent 2843
- d4142608cffc
- child 2847
- 1843ef6e2656
- child 2962
- d6c9d1ca2da4
equal
deleted
inserted
replaced
| 2843:d4142608cffc | 2844:a61ee61b1c2c |
|---|---|
| 1716 else: | 1716 else: |
| 1717 rev1, rev2 = "", "" | 1717 rev1, rev2 = "", "" |
| 1718 | 1718 |
| 1719 output1, error = self.__hgGetFileForRevision(name, rev=rev1) | 1719 output1, error = self.__hgGetFileForRevision(name, rev=rev1) |
| 1720 if error: | 1720 if error: |
| 1721 E5MessageBox.critical(self, | 1721 E5MessageBox.critical(self.__ui, |
| 1722 self.trUtf8("Mercurial Side-by-Side Difference"), | 1722 self.trUtf8("Mercurial Side-by-Side Difference"), |
| 1723 error) | 1723 error) |
| 1724 return | 1724 return |
| 1725 name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".") | 1725 name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".") |
| 1726 | 1726 |
| 1727 if rev2: | 1727 if rev2: |
| 1728 output2, error = self.__hgGetFileForRevision(name, rev=rev2) | 1728 output2, error = self.__hgGetFileForRevision(name, rev=rev2) |
| 1729 if error: | 1729 if error: |
| 1730 E5MessageBox.critical(self, | 1730 E5MessageBox.critical(self.__ui, |
| 1731 self.trUtf8("Mercurial Side-by-Side Difference"), | 1731 self.trUtf8("Mercurial Side-by-Side Difference"), |
| 1732 error) | 1732 error) |
| 1733 return | 1733 return |
| 1734 name2 = "{0} (rev. {1})".format(name, rev2) | 1734 name2 = "{0} (rev. {1})".format(name, rev2) |
| 1735 else: | 1735 else: |
| 1737 f1 = open(name, "r", encoding="utf-8") | 1737 f1 = open(name, "r", encoding="utf-8") |
| 1738 output2 = f1.read() | 1738 output2 = f1.read() |
| 1739 f1.close() | 1739 f1.close() |
| 1740 name2 = name | 1740 name2 = name |
| 1741 except IOError: | 1741 except IOError: |
| 1742 E5MessageBox.critical(self, | 1742 E5MessageBox.critical(self.__ui, |
| 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 |
