Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hgthread: print errors in heavy red font

Changeset d62a691052ae…

Parent 55856833dd63…

by Steve Borho

Changes to 4 files · Browse files at d62a691052ae Showing diff from parent 55856833dd63 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hgcmd.py Stacked
 
80
81
82
 
 
83
84
85
 
130
131
132
 
 
 
 
 
 
 
133
134
135
 
80
81
82
83
84
85
86
87
 
132
133
134
135
136
137
138
139
140
141
142
143
144
@@ -80,6 +80,8 @@
  self.textview.modify_font(pango.FontDescription('Monospace'))   scrolledwindow.add(self.textview)   self.textbuffer = self.textview.get_buffer() + self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY, + foreground='#900000')     self.vbox.pack_start(scrolledwindow, True, True)   self.connect('map_event', self._on_window_map_event) @@ -130,6 +132,13 @@
  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.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():   self._button_stop.set_sensitive(False)
Change 1 of 5 Show Entire File hggtk/​hgthread.py Stacked
 
22
23
24
25
26
 
 
27
28
29
 
33
34
35
 
36
37
38
39
 
40
41
42
 
48
49
50
51
 
52
53
54
 
95
96
97
 
98
99
100
 
 
101
102
103
 
107
108
109
 
 
 
110
111
112
 
22
23
24
 
 
25
26
27
28
29
 
33
34
35
36
37
38
39
40
41
42
43
44
 
50
51
52
 
53
54
55
56
 
97
98
99
100
101
102
 
103
104
105
106
107
 
111
112
113
114
115
116
117
118
119
@@ -22,8 +22,8 @@
  Instead, it places output and dialog requests onto queues for the   main thread to pickup.   ''' - def __init__(self, src=None, outputq=None, dialogq=None, responseq=None, - parentui=None): + def __init__(self, src=None, outputq=None, errorq=None, dialogq=None, + responseq=None, parentui=None):   if parentui:   # Mercurial 1.2   super(GtkUi, self).__init__(parentui=parentui) @@ -33,10 +33,12 @@
  super(GtkUi, self).__init__(src)   if src:   self.outputq = src.outputq + self.errorq = src.errorq   self.dialogq = src.dialogq   self.responseq = src.responseq   else:   self.outputq = outputq + self.errorq = errorq   self.dialogq = dialogq   self.responseq = responseq   self.setconfig('ui', 'interactive', 'on') @@ -48,7 +50,7 @@
    def write_err(self, *args):   for a in args: - self.outputq.put('*** ' + str(a)) + self.errorq.put(str(a))     def flush(self):   pass @@ -95,9 +97,11 @@
  '''   def __init__(self, args=[], postfunc=None, parent=None):   self.outputq = Queue.Queue() + self.errorq = Queue.Queue()   self.dialogq = Queue.Queue()   self.responseq = Queue.Queue() - self.ui = GtkUi(None, self.outputq, self.dialogq, self.responseq) + self.ui = GtkUi(None, self.outputq, self.errorq, self.dialogq, + self.responseq)   self.args = args   self.ret = None   self.postfunc = postfunc @@ -107,6 +111,9 @@
  def getqueue(self):   return self.outputq   + def geterrqueue(self): + return self.errorq +   def return_code(self):   '''   None - command is incomplete, possibly exited with exception
Change 1 of 3 Show Entire File hggtk/​recovery.py Stacked
 
83
84
85
 
 
86
87
88
 
189
190
191
 
 
 
 
 
192
193
194
 
200
201
202
 
 
 
 
 
 
 
203
204
205
206
207
208
209
 
210
211
212
 
83
84
85
86
87
88
89
90
 
191
192
193
194
195
196
197
198
199
200
201
 
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
 
223
224
225
226
@@ -83,6 +83,8 @@
  scrolledwindow.add(self.textview)   self.textview.set_editable(False)   self.textbuffer = self.textview.get_buffer() + self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY, + foreground='#900000')   vbox.pack_start(scrolledwindow, True, True)     self.stbar = gtklib.StatusBar() @@ -189,6 +191,11 @@
  else:   self.textbuffer.set_text(msg)   + def write_err(self, msg): + enditer = self.textbuffer.get_end_iter() + self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error') + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0) +   def process_queue(self):   """   Handle all the messages currently in the queue (if any). @@ -200,13 +207,20 @@
  self.write(msg)   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   else:   self.stbar.end()   self._stop_button.set_sensitive(False)   if self.hgthread.return_code() is None: - self.write(_('[command interrupted]')) + self.write_err(_('[command interrupted]'))   return False # Stop polling this function    def run(ui, *pats, **opts):
Change 1 of 4 Show Entire File hggtk/​synch.py Stacked
 
228
229
230
 
 
231
232
233
 
569
570
571
 
 
 
 
 
572
573
574
 
580
581
582
 
 
 
 
 
 
583
584
585
 
589
590
591
592
 
593
594
595
 
228
229
230
231
232
233
234
235
 
571
572
573
574
575
576
577
578
579
580
581
 
587
588
589
590
591
592
593
594
595
596
597
598
 
602
603
604
 
605
606
607
608
@@ -228,6 +228,8 @@
  self.textview.set_editable(False)   self.textview.connect('populate-popup', self._add_to_popup)   self.textbuffer = self.textview.get_buffer() + self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY, + foreground='#900000')   vbox.pack_start(scrolledwindow, True, True)     self.buttonhbox = gtk.HBox() @@ -569,6 +571,11 @@
  else:   self.textbuffer.set_text(msg)   + def write_err(self, msg): + enditer = self.textbuffer.get_end_iter() + self.textbuffer.insert_with_tags_by_name(enditer, msg, 'error') + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0) +   def process_queue(self):   """   Handle all the messages currently in the queue (if any). @@ -580,6 +587,12 @@
  self.write(msg)   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 @@ -589,7 +602,7 @@
  self.stbar.end()   self._stop_button.set_sensitive(False)   if self.hgthread.return_code() is None: - self.write(_('[command interrupted]')) + self.write_err(_('[command interrupted]'))   if self.notify_func:   self.notify_func(self.notify_args)   return False # Stop polling this function