Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable merge: improve default merge message when merging named branches (closes #385)

When merging two different branches, set the default merge message to
"Merge with other_branch_name".

Changeset 343673de097e…

Parent d572bfb39e7d…

by Angel Ezquerra

Changes to one file · Browse files at 343673de097e Showing diff from parent d572bfb39e7d Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
631
632
633
634
635
 
 
 
 
 
 
 
 
 
 
 
 
636
637
638
 
631
632
633
 
 
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
@@ -631,8 +631,18 @@
  msg_text.refresh(repo)   msg_text.loadSettings(QSettings(), 'merge/message')   engmsg = repo.ui.configbool('tortoisehg', 'engmsg', False) - msgset = keep._('Merge ') - msg_text.setText(engmsg and msgset['id'] or msgset['str']) + p1branch = repo[None].p1().branch() + p2branch = repo[None].p2().branch() + if p1branch == p2branch: + msgset = keep._('Merge ') + else: + # Show a default 'Merge with OTHER_BRANCH' message when merging + # changesets from different branches + msgset = keep._('Merge with %s') + msg = engmsg and msgset['id'] or msgset['str'] + if p1branch != p2branch: + msg = unicode(msg) % hglib.tounicode(p2branch) + msg_text.setText(msg)   msg_text.textChanged.connect(self.completeChanged)   self.msg_text = msg_text   box.addWidget(msg_text)