Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.1, 2.1.2, and tip

stable fileview: avoid unwanted unicode issue at timerBuildDiffMarkers (fixes #857)

We don't need to convert the diff content to local encoding here, because it
isn't passed to Mercurial API.

Changeset 2be1aa0c29a2…

Parent 361dacec7eff…

by Yuya Nishihara

Changes to one file · Browse files at 2be1aa0c29a2 Showing diff from parent 361dacec7eff Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
490
491
492
493
494
 
495
496
497
 
490
491
492
 
 
493
494
495
496
@@ -490,8 +490,7 @@
  if self._fd:   self._fd = None   self._diffs = [] - self._linestoprocess = \ - hglib.fromunicode(self.sci.text()).splitlines() + self._linestoprocess = unicode(self.sci.text()).splitlines()   self._firstlinetoprocess = 0   self._opcodes = True   # Process linesPerBlock lines at a time