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 changeset: highlight current diff parent in changeset header

Changeset 7d2338a63711…

Parent f5ec4035ce66…

by Yuki KODAMA

Changes to one file · Browse files at 7d2338a63711 Showing diff from parent f5ec4035ce66 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
43
44
45
 
46
47
48
 
421
422
423
424
 
425
426
427
428
 
429
430
431
432
433
434
435
 
 
 
 
 
 
 
436
437
438
 
461
462
463
464
 
465
466
467
 
483
484
485
486
 
487
 
 
488
489
490
 
43
44
45
46
47
48
49
 
422
423
424
 
425
426
427
428
 
429
430
431
432
433
434
435
 
436
437
438
439
440
441
442
443
444
445
 
468
469
470
 
471
472
473
474
 
490
491
492
 
493
494
495
496
497
498
499
@@ -43,6 +43,7 @@
  return []     def parent_toggled(self, button): + self.clear_cache()   self.load_details(self.currev)     def prepare_display(self): @@ -421,18 +422,24 @@
  def summary_line(desc):   desc = desc.replace('\0', '')   return hglib.toutf(desc.split('\n')[0][:80]) - def revline_data(ctx): + def revline_data(ctx, hl=False):   if isinstance(ctx, basestring):   return ctx   desc = ctx.description() - return (str(ctx.rev()), str(ctx), summary_line(desc)) + return (str(ctx.rev()), str(ctx), summary_line(desc), hl)   if item == 'cset':   return revline_data(ctx)   elif item == 'branch':   value = hglib.toutf(ctx.branch())   return value != 'default' and value or None   elif item == 'parents': - return [revline_data(ctx) for ctx in ctx.parents()] + pindex = self.diff_other_parent() and 1 or 0 + pctxs = ctx.parents() + parents = [] + for pctx in pctxs: + highlight = len(pctxs) == 2 and pctx == pctxs[pindex] + parents.append(revline_data(pctx, highlight)) + return parents   elif item == 'children':   return [revline_data(ctx) for ctx in ctx.children()]   elif item == 'transplant': @@ -461,7 +468,7 @@
  return _('Patch:')   raise csinfo.UnknownItem(item)   def markup_func(widget, item, value): - def revline_markup(revnum, revid, summary): + def revline_markup(revnum, revid, summary, highlight):   revnum = gtklib.markup(revnum)   summary = gtklib.markup(summary)   if revid: @@ -483,8 +490,10 @@
  return csets   raise csinfo.UnknownItem(item)   def widget_func(widget, item, markups): - def linkwidget(revnum, revid, summary): + def linkwidget(revnum, revid, summary, highlight):   opts = dict(underline='single', foreground='#0000FF') + if highlight: + opts['weight'] = 'bold'   rev = '%s (%s)' % (gtklib.markup(revnum, **opts),   revid_markup(revid, **opts))   link = gtk.Label()