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

stable chunks: avoid unicode round-trip, read file contents from repo (closes #462)

Changeset 4a17b61ddfbd…

Parent 5febf29223f3…

by Steve Borho

Changes to one file · Browse files at 4a17b61ddfbd Showing diff from parent 5febf29223f3 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
214
215
216
217
 
218
219
220
 
624
625
626
627
628
629
630
 
214
215
216
 
217
218
219
220
 
624
625
626
 
627
628
629
@@ -214,7 +214,7 @@
  wlock = repo.wlock()   try:   repo.wopener(self.currentFile, 'wb').write( - hglib.fromunicode(self.diffbrowse.origcontents)) + repo['.'][self.currentFile].data())   fp = cStringIO.StringIO()   chunks[0].write(fp)   for c in kchunks: @@ -624,7 +624,6 @@
  else:   self.sci.markerAdd(start+i, self.vertical)   start += len(chunk.lines) + 1 - self.origcontents = fd.olddata   self.countselected = 0   self.curchunks = chunks   for c in chunks[1:]: