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

merge: use preset 'ishead' item

Changeset dbad776e38c5…

Parent b3e9698581b2…

by Yuki KODAMA

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

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
71
72
73
74
75
76
77
78
79
80
81
82
 
83
84
85
 
71
72
73
 
 
 
74
75
76
77
 
 
78
79
80
81
@@ -71,15 +71,11 @@
  # changeset info   style = csinfo.panelstyle(contents=csinfo.PANEL_DEFAULT + ('ishead',),   margin=5, padding=2) - def data_func(widget, ctx): - node = ctx.node() - return node in repo.heads()   def markup_func(widget, value):   if value:   return ''   return gtklib.markup(_('Not a head revision!'), weight='bold') - custom = csinfo.custom(ishead={ - 'data': data_func, 'markup': markup_func}) + custom = csinfo.custom(ishead={'markup': markup_func})   factory = csinfo.factory(repo, custom, style)     info = factory(rev1, style={'label': _('Merge target (other)')})