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

Merge with stable

Changeset ee51a4735fb3…

Parents 5c0329f184c8…

Parents 989a18e00cdb…

by Steve Borho

Changes to one file · Browse files at ee51a4735fb3 Showing diff from parent 5c0329f184c8 989a18e00cdb Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
638
639
640
641
642
643
644
645
646
647
 
 
 
648
649
650
651
652
 
 
 
 
 
 
653
654
655
 
638
639
640
 
 
 
 
 
 
 
641
642
643
644
645
646
647
 
648
649
650
651
652
653
654
655
656
@@ -638,18 +638,19 @@
  else:   plus, minus = _('_Commit (+1 head)'), _('_Commit (-1 head)')   ctxs, isheads, ismerge = self.get_head_info() - if not ismerge: - if not isheads[0]: - label = plus - tooltip = _('parent is not a head, ' - 'commit to add a new head') - else: - if isheads[0] and isheads[1]: + if ismerge: + b1, b2 = [c.branch() for c in ctxs] + if isheads[0] and isheads[1] and b1 == b2:   label = minus   tooltip = _('commit to merge one head')   elif not isheads[0] and not isheads[1]:   label = plus - tooltip = _('no parent is a head, ' + tooltip = _('neither parent is a head, ' + 'commit to add a new head') + else: + if not isheads[0]: + label = plus + tooltip = _('parent is not a head, '   'commit to add a new head')     btn = self.get_toolbutton('commit')