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

hgcmd: take errors before normal messages

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

Changeset b13bc9a3a3aa…

Parent c73989b5448c…

by Steve Borho

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

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​hgcmd.py Stacked
 
157
158
159
 
 
 
 
 
 
 
 
 
 
 
 
 
 
160
161
162
 
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
 
563
564
565
 
 
 
 
 
 
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
 
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
 
189
190
191
 
 
 
 
 
 
 
 
 
 
 
 
 
 
192
193
194
 
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
 
 
 
 
 
 
578
579
580
@@ -157,6 +157,20 @@
  """   self.hgthread.process_dialogs()   enditer = self.textbuffer.get_end_iter() + while self.hgthread.geterrqueue().qsize(): + try: + msg = hglib.toutf(self.hgthread.geterrqueue().get(0)) + self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error') + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0) + except Queue.Empty: + pass + while self.stdoutq.qsize(): + try: + msg = hglib.toutf(self.stdoutq.get(0)) + self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error') + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0) + except Queue.Empty: + pass   while self.hgthread.getqueue().qsize():   try:   msg, label = self.hgthread.getqueue().get(0) @@ -175,20 +189,6 @@
  self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)   except Queue.Empty:   pass - while self.hgthread.geterrqueue().qsize(): - try: - msg = hglib.toutf(self.hgthread.geterrqueue().get(0)) - self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error') - self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0) - except Queue.Empty: - pass - while self.stdoutq.qsize(): - try: - msg = hglib.toutf(self.stdoutq.get(0)) - self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error') - self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0) - except Queue.Empty: - pass     self.update_progress()   if not self.hgthread.isAlive(): @@ -563,18 +563,18 @@
  self.hgthread.process_dialogs()     # output to buffer + while self.hgthread.geterrqueue().qsize(): + try: + msg = self.hgthread.geterrqueue().get(0) + self.log.append(hglib.toutf(msg), error=True) + except Queue.Empty: + pass   while self.hgthread.getqueue().qsize():   try:   msg, label = self.hgthread.getqueue().get(0)   self.log.append(hglib.toutf(msg))   except Queue.Empty:   pass - while self.hgthread.geterrqueue().qsize(): - try: - msg = self.hgthread.geterrqueue().get(0) - self.log.append(hglib.toutf(msg), error=True) - except Queue.Empty: - pass     # update progress bar   self.update_progress()