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

rejects: delay initial selection until after dialog is drawn

Changeset 6fe36c88a6ba…

Parent ed7334e3cccc…

by Steve Borho

Changes to one file · Browse files at 6fe36c88a6ba Showing diff from parent ed7334e3cccc Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
23
24
25
26
27
28
29
 
110
111
112
113
 
114
115
116
 
152
153
154
 
155
156
157
 
23
24
25
 
26
27
28
 
109
110
111
 
112
113
114
115
 
151
152
153
154
155
156
157
@@ -23,7 +23,6 @@
 qsci = Qsci.QsciScintilla    # TODO -# improve scrolling of qsci, often cursor is not visible  # pass ui to patchctx.longsummary() so patchctx does not need a repository    class RejectsDialog(QDialog): @@ -110,7 +109,7 @@
  for chunk in self.chunks:   chunk.resolved = False   self.updateChunkList() - self.chunklist.setCurrentRow(0) + QTimer.singleShot(0, lambda: self.chunklist.setCurrentRow(0))     def updateChunkList(self):   self.updating = True @@ -152,6 +151,7 @@
  chunk.write(buf)   self.rejectbrowser.showChunk(buf.getvalue().splitlines()[1:])   self.editor.setCursorPosition(chunk.fromline-1, 0) + self.editor.ensureLineVisible(chunk.fromline-1)   self.editor.markerDeleteAll(-1)   self.editor.markerAdd(chunk.fromline-1, self.baseLineColor)   self.resolved.setEnabled(not chunk.resolved)