Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

chunks: getSelectedFileAndChunks() needs to always include the header chunk

Changeset 85ad8c50bca0…

Parent 4b6037343bad…

by Steve Borho

Changes to one file · Browse files at 85ad8c50bca0 Showing diff from parent 4b6037343bad Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
105
106
107
108
 
109
110
111
 
210
211
212
213
214
215
216
 
217
218
219
 
105
106
107
 
108
109
110
111
 
210
211
212
 
 
 
 
213
214
215
216
@@ -105,7 +105,7 @@
  def getSelectedFileAndChunks(self):   chunks = self.diffbrowse.curchunks   dchunks = [c for c in chunks[1:] if c.selected] - return self.currentFile, dchunks + return self.currentFile, [chunks[0]] + dchunks     def deleteSelectedChunks(self):   'delete currently selected chunks' @@ -210,10 +210,7 @@
  ctx._files[wfile] = newchunks   else:   # add file to patch - lines = ['diff -r aaaaaaaaaaaa -r bbbbbbbbbbb %s\n' % wfile] - lines.append('--- a/%s\n' % wfile) - lines.append('+++ b/%s\n' % wfile) - ctx._files[wfile] = [record.header(lines)] + chunks + ctx._files[wfile] = chunks   ctx._fileorder.append(wfile)   repo.thgbackup(ctx._path)   fp = util.atomictempfile(ctx._path, 'wb')