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

stable visdiff: fix possible unicode error at launchtool (refs #796)

'_nonexistant' can be unicode due to _(), but 'replace' dict shouldn't
contain unicode.

Changeset d298825a4b2c…

Parent 2be1aa0c29a2…

by Yuya Nishihara

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

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
308
309
310
311
 
 
312
313
314
 
544
545
546
547
 
548
549
550
 
308
309
310
 
311
312
313
314
315
 
545
546
547
 
548
549
550
551
@@ -308,7 +308,8 @@
  nullfile = os.path.join(qtlib.gettempdir(), 'empty')   fp = open(nullfile, 'w')   fp.close() - return _nonexistant+label, nullfile + return (hglib.fromunicode(_nonexistant, 'replace') + label, + nullfile)     # If only one change, diff the files instead of the directories   # Handle bogus modifies correctly by checking if the files exist @@ -544,7 +545,7 @@
  nullfile = os.path.join(qtlib.gettempdir(), 'empty')   fp = open(nullfile, 'w')   fp.close() - return _nonexistant, nullfile + return hglib.fromunicode(_nonexistant, 'replace'), nullfile     local, file1a = getfile(ctx1a, dir1a, fname, source)   if ctx1b: