Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable csinfo: fix preset data & markups

get_data() should return raw data, not string, if it's possible.

Changeset b525951171bc…

Parent 49b954474172…

by Yuki KODAMA

Changes to 2 files · Browse files at b525951171bc Showing diff from parent 49b954474172 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
443
444
445
446
 
447
448
449
 
443
444
445
 
446
447
448
449
@@ -443,7 +443,7 @@
  elif item == 'branch':   value = hglib.toutf(ctx.branch())   return value != 'default' and value or None - if item == 'dateage': + elif item == 'dateage':   date = widget.get_data('date')   age = widget.get_data('age')   if date is not None and age is not None:
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​csinfo.py Stacked
 
204
205
206
207
 
208
209
 
210
211
212
 
291
292
293
 
 
294
295
296
297
298
 
 
 
 
 
 
 
 
299
300
301
 
306
307
308
309
 
310
311
312
 
204
205
206
 
207
208
 
209
210
211
212
 
291
292
293
294
295
296
297
298
 
 
299
300
301
302
303
304
305
306
307
308
309
 
314
315
316
 
317
318
319
320
@@ -204,9 +204,9 @@
  if item == 'rev':   revnum = self.get_data('revnum', *args)   revid = self.get_data('revid', *args) - return '%s (%s)' % (revnum, revid) + return (revnum, revid)   elif item == 'revnum': - return str(ctx.rev()) + return ctx.rev()   elif item == 'revid':   return str(ctx)   elif item == 'desc': @@ -291,11 +291,19 @@
  return default_func(widget, item)     def get_markup(self, item, widget, ctx, custom): + args = (widget, ctx, custom) + mono = dict(face='monospace', size='9000')   def default_func(widget, item, value):   return ''   def preset_func(widget, item, value): - if item in ('rev', 'revnum', 'revid'): - return gtklib.markup(value, face='monospace', size='9000') + if item == 'rev': + revnum, revid = value + revid = gtklib.markup(revid, **mono) + return '%s (%s)' % (revnum, revid) + elif item == 'revid': + return gtklib.markup(value, **mono) + elif item == 'revnum': + return str(value)   elif item in ('rawbranch', 'branch'):   return gtklib.markup(' %s ' % value, color='black',   background='#aaffaa') @@ -306,7 +314,7 @@
  elif item in ('desc', 'summary', 'user', 'date', 'age'):   return gtklib.markup(value)   raise UnknownItem(item) - value = self.get_data(item, widget, ctx, custom) + value = self.get_data(item, *args)   if value is None:   return None   if custom.has_key('markup'):