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

stable rejects: preserve eoln state of patch chunks, fix lexer detection (closes #467)

Changeset 9d5eeff6f79d…

Parent 2ddb74092ceb…

by Steve Borho

Changes to one file · Browse files at 9d5eeff6f79d Showing diff from parent 2ddb74092ceb Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
95
96
97
 
98
99
100
 
103
104
105
106
 
107
108
109
 
163
164
165
166
 
167
168
169
 
253
254
255
256
 
257
258
259
 
95
96
97
98
99
100
101
 
104
105
106
 
107
108
109
110
 
164
165
166
 
167
168
169
170
 
254
255
256
 
257
258
259
260
@@ -95,6 +95,7 @@
  f.open(QIODevice.ReadOnly)   editor.read(f)   editor.setModified(False) + f.seek(0)   lexer = lexers.get_lexer(path, f.readData(1024), self)   editor.setLexer(lexer)   editor.setMarginLineNumbers(1, True) @@ -103,7 +104,7 @@
  buf = cStringIO.StringIO()   try:   buf.write('diff -r aaaaaaaaaaaa -r bbbbbbbbbbb %s\n' % path) - buf.write(open(path + '.rej', 'r').read()) + buf.write(open(path + '.rej', 'rb').read())   buf.seek(0)   except IOError, e:   pass @@ -163,7 +164,7 @@
  buf = cStringIO.StringIO()   chunk = self.chunks[row]   chunk.write(buf) - self.rejectbrowser.showChunk(buf.getvalue().splitlines()[1:]) + self.rejectbrowser.showChunk(buf.getvalue().splitlines(True)[1:])   self.editor.setCursorPosition(chunk.fromline-1, 0)   self.editor.ensureLineVisible(chunk.fromline-1)   self.editor.markerDeleteAll(-1) @@ -253,7 +254,7 @@
  elif line[0] == '-':   removed.append(i)   self.markerDeleteAll(-1) - self.setText(u'\n'.join(utext)) + self.setText(u''.join(utext))   for i in added:   self.markerAdd(i, self.addedMark)   self.markerAdd(i, self.addedColor)