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

commit: respect "totoisehg.engmsg" setting on merge

Changeset 80e373a32615…

Parent 3335d5a61a4a…

by Yuki KODAMA

Changes to one file · Browse files at 80e373a32615 Showing diff from parent 3335d5a61a4a Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
19
20
21
22
 
 
 
23
24
25
 
782
783
784
785
786
787
788
 
 
 
 
 
 
789
790
791
 
19
20
21
 
22
23
24
25
26
27
 
784
785
786
 
 
 
 
787
788
789
790
791
792
793
794
795
@@ -19,7 +19,9 @@
 from mercurial import hg, util, patch, cmdutil, extensions    from tortoisehg.util.i18n import _ -from tortoisehg.util import shlib, hglib +from tortoisehg.util import shlib, hglib, i18n + +keep = i18n.keepgettext()    from tortoisehg.hgtk.status import GStatus, FM_STATUS, FM_CHECKED  from tortoisehg.hgtk.status import FM_PATH, FM_PATH_UTF8 @@ -782,10 +784,12 @@
    # pre-fill commit message, if not modified   buf = self.text.get_buffer() - if not buf.get_modified(): - buf.set_text(_('Merge ')) - buf.set_modified(False) - + if buf.get_modified(): + return + engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) + msgset = keep._('Merge ') + buf.set_text(engmsg and msgset['id'] or msgset['str']) + buf.set_modified(False)     def check_patch_queue(self):   'See if an MQ patch is applied, switch to qrefresh mode'