Changeset d01af8569bf7…
Parent 621b71486c09…
by
Changes to one file · Browse files at d01af8569bf7 Showing diff from parent 621b71486c09 Diff from another changeset...
@@ -400,7 +400,8 @@ side = 'left'
path = self.filerevmodel.graph.nodesdict[rev].extra[0]
fc = self.repo.changectx(rev).filectx(path)
- self.filedata[side] = fc.data().splitlines()
+ data = hglib.tounicode(fc.data())
+ self.filedata[side] = data.splitlines()
self.update_diff(keeppos=otherside[side])
def goto(self, rev):
@@ -523,7 +524,7 @@ self._diffmatch = {'left': [x[1:3] for x in blocks],
'right': [x[3:5] for x in blocks]}
for side in sides:
- self.viewers[side].setText('\n'.join(self.filedata[side]))
+ self.viewers[side].setText(u'\n'.join(self.filedata[side]))
self.update_page_steps(keeppos)
self.timer.start()
|
Loading...