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

thgpbranch: Make sure pnew is not activated on merge

Changeset 169556322d1e…

Parent f598e68cb011…

by Peer Sommerlund

Changes to one file · Browse files at 169556322d1e Showing diff from parent f598e68cb011 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​thgpbranch.py Stacked
 
482
483
484
 
485
486
487
 
488
489
490
 
520
521
522
 
523
524
 
525
526
527
 
482
483
484
485
486
487
 
488
489
490
491
 
521
522
523
524
525
 
526
527
528
529
@@ -482,9 +482,10 @@
  self.list.set_sensitive(True)   self.btn['menu'].set_sensitive(True)   in_pbranch = True #TODO + is_merge = len(self.repo.parents()) > 1   self.btn['pmerge'].set_sensitive(in_pbranch)   self.btn['pbackout'].set_sensitive(in_pbranch) - self.btn['pnew'].set_sensitive(True) + self.btn['pnew'].set_sensitive(not is_merge)   self.btn['reapply'].set_sensitive(True)   else:   self.list.set_sensitive(False) @@ -520,8 +521,9 @@
  has_pbranch = self.has_pbranch()   is_current = self.has_patch() and self.cur_patch() == row[M_NAME]   is_patch = row[M_NAME] != 'default' + is_merge = len(self.repo.branchheads(row[M_NAME])) > 1   - if has_pbranch: + if has_pbranch and not is_merge:   append(_('_new'), self.pnew_activated)   if not is_current:   append(_('_goto (update workdir)'), self.goto_activated)