Commits

André Sintzoff committed 0041b29

filedata: fix mdiff.unidiff call after Mercurial c84ef0047a94 changeset

We can not use mdiff.diffline as this function was moved to mercurial/patch.py
in Mercurial changeset 9a6e4d5d7ea8 and becomes a nested function.

Comments (0)

Files changed (1)

tortoisehg/hgqt/filedata.py

         if isbfile:
             olddata += '\0'
             newdata += '\0'
-        self.diff = mdiff.unidiff(olddata, olddate, newdata, newdate,
-                                  oldname, wfile, revs, diffopts)
+
+        self.diff = 'diff -r ' + ' -r '.join(revs) + ' ' + oldname + '\n'
+        self.diff += mdiff.unidiff(olddata, olddate, newdata, newdate,
+                                   oldname, wfile, opts=diffopts)