Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- 5_5_x
- changeset 3884
- e4764ef5f71b
- parent 3875
- 21d3683ed656
equal
deleted
inserted
replaced
| 3881:788a2185eabb | 3884:e4764ef5f71b |
|---|---|
| 1870 else: | 1870 else: |
| 1871 try: | 1871 try: |
| 1872 f1 = open(name, "r", encoding="utf-8") | 1872 f1 = open(name, "r", encoding="utf-8") |
| 1873 output2 = f1.read() | 1873 output2 = f1.read() |
| 1874 f1.close() | 1874 f1.close() |
| 1875 name2 = name | 1875 name2 = "{0} (Work)".format(name) |
| 1876 except IOError: | 1876 except IOError: |
| 1877 E5MessageBox.critical( | 1877 E5MessageBox.critical( |
| 1878 self.__ui, | 1878 self.__ui, |
| 1879 self.tr("Mercurial Side-by-Side Difference"), | 1879 self.tr("Mercurial Side-by-Side Difference"), |
| 1880 self.tr( | 1880 self.tr( |
