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

rejects: tweak line numbers

Changeset 7f17cd53d1ce…

Parent 9f0e285e51d2…

by Steve Borho

Changes to one file · Browse files at 7f17cd53d1ce Showing diff from parent 9f0e285e51d2 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
87
88
89
90
 
91
92
93
 
97
98
99
100
 
101
102
 
103
104
105
 
87
88
89
 
90
91
92
93
 
97
98
99
 
100
101
 
102
103
104
105
@@ -87,7 +87,7 @@
  buf.seek(0)   self.chunks = record.parsepatch(buf)[1:]   for chunk in self.chunks: - self.chunklist.addItem(str(chunk.fromline)) + self.chunklist.addItem('@@ %d' % chunk.fromline)     @pyqtSlot(int)   def showChunk(self, row): @@ -97,9 +97,9 @@
  chunk = self.chunks[row]   chunk.write(buf)   self.rejectbrowser.showChunk(buf.getvalue().splitlines()[1:]) - self.editor.setCursorPosition(chunk.fromline, 0) + self.editor.setCursorPosition(chunk.fromline-1, 0)   self.editor.markerDeleteAll(-1) - self.editor.markerAdd(chunk.fromline, self.baseLineColor) + self.editor.markerAdd(chunk.fromline-1, self.baseLineColor)     def accept(self):   f = util.atomictempfile(filename, 'wb', createmode=None)