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

recovery: parse labels from hgthread output queue

Changeset 8c1055b016d4…

Parent 0e81e5a14290…

by Steve Borho

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

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​recovery.py Stacked
 
86
87
88
89
90
 
 
91
92
93
 
202
203
204
 
205
206
207
208
 
 
 
 
 
 
 
 
 
 
 
 
 
 
209
210
211
 
86
87
88
 
 
89
90
91
92
93
 
202
203
204
205
206
207
 
 
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
@@ -86,8 +86,8 @@
  self.textview.modify_font(pango.FontDescription(fontlog))   scrolledwindow.add(self.textview)   self.textbuffer = self.textview.get_buffer() - self.textbuffer.create_tag('error', weight=pango.WEIGHT_HEAVY, - foreground=gtklib.DRED) + for tag, argdict in gtklib.TextBufferTags.iteritems(): + self.textbuffer.create_tag(tag, **argdict)   vbox.pack_start(scrolledwindow, True, True)     self.stbar = statusbar.StatusBar() @@ -202,10 +202,23 @@
  Handle all the messages currently in the queue (if any).   """   self.hgthread.process_dialogs() + enditer = self.textbuffer.get_end_iter()   while self.hgthread.getqueue().qsize():   try: - msg = self.hgthread.getqueue().get(0) - self.write(msg) + msg, label = self.hgthread.getqueue().get(0) + tags = [] + for tag in label.split(): + tag.strip() + if tag in gtklib.TextBufferTags: + tags.append(tag) + #else: + # print 'unknown tag:', tag + msg = hglib.toutf(msg) + if tags: + self.textbuffer.insert_with_tags_by_name(enditer, msg, *tags) + else: + self.textbuffer.insert(enditer, msg) + self.textview.scroll_to_mark(self.textbuffer.get_insert(), 0)   except Queue.Empty:   pass   while self.hgthread.geterrqueue().qsize():