Mercurial Repositories > eric / changeset
changeset
Fixed another issue in the Mercurial side-by-side function.
Mon, 05 Aug 2013 13:17:51 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 05 Aug 2013 13:17:51 +0200
- changeset 2844
- a61ee61b1c2c
- parent 2843
- d4142608cffc
- child 2845
- 7e55c6268c35
Fixed another issue in the Mercurial side-by-side function.
| Plugins/VcsPlugins/vcsMercurial/hg.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Aug 05 13:01:46 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Aug 05 13:17:51 2013 +0200 @@ -1718,7 +1718,7 @@ output1, error = self.__hgGetFileForRevision(name, rev=rev1) if error: - E5MessageBox.critical(self, + E5MessageBox.critical(self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), error) return @@ -1727,7 +1727,7 @@ if rev2: output2, error = self.__hgGetFileForRevision(name, rev=rev2) if error: - E5MessageBox.critical(self, + E5MessageBox.critical(self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), error) return @@ -1739,7 +1739,7 @@ f1.close() name2 = name except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical(self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") .format(name))
