Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

recovery: take errors before normal messages

This makes the output more match the console when errors are encountered

Changeset c73989b5448c…

Parent 8c1055b016d4…

by Steve Borho

Changes to one file · Browse files at c73989b5448c Showing diff from parent 8c1055b016d4 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​recovery.py Stacked
 
202
203
204
 
 
 
 
 
 
205
206
207
 
221
222
223
224
225
226
227
228
229
230
231
232
 
202
203
204
205
206
207
208
209
210
211
212
213
 
227
228
229
 
 
 
 
 
 
230
231
232
@@ -202,6 +202,12 @@
  Handle all the messages currently in the queue (if any).   """   self.hgthread.process_dialogs() + while self.hgthread.geterrqueue().qsize(): + try: + msg = self.hgthread.geterrqueue().get(0) + self.write_err(msg) + except Queue.Empty: + pass   enditer = self.textbuffer.get_end_iter()   while self.hgthread.getqueue().qsize():   try: @@ -221,12 +227,6 @@
  self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)   except Queue.Empty:   pass - while self.hgthread.geterrqueue().qsize(): - try: - msg = self.hgthread.geterrqueue().get(0) - self.write_err(msg) - except Queue.Empty: - pass     if self._cmd_running():   return True