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

chunks: catch up with filelistview changes

Changeset 639101ab707b…

Parent 2b70a8f20018…

by Steve Borho

Changes to one file · Browse files at 639101ab707b Showing diff from parent 2b70a8f20018 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
71
72
73
74
 
75
76
77
 
338
339
340
341
342
 
 
 
 
 
343
344
345
 
71
72
73
 
74
75
76
77
 
338
339
340
 
 
341
342
343
344
345
346
347
348
@@ -71,7 +71,7 @@
  self.diffbrowse.linkActivated.connect(self.linkActivated)   self.diffbrowse.chunksSelected.connect(self.chunksSelected)   - self.filelist.fileRevSelected.connect(self.displayFile) + self.filelist.fileSelected.connect(self.displayFile)   self.filelist.clearDisplay.connect(self.diffbrowse.clearDisplay)     self.splitter.setStretchFactor(0, 0) @@ -338,8 +338,11 @@
  header = record.parsepatch(buf)[0]   return [header] + header.hunks   - @pyqtSlot(object, object, object) - def displayFile(self, file, rev, status): + @pyqtSlot(QString, QString) + def displayFile(self, file, status): + if isinstance(file, (unicode, QString)): + file = hglib.fromunicode(file) + status = hglib.fromunicode(status)   if file:   self.currentFile = file   path = self.repo.wjoin(file)