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: show the name of configured merge tool if exists

Changeset 55b9af63c5cc…

Parent 8aa5f3e68c95…

by Yuki KODAMA

Changes to one file · Browse files at 55b9af63c5cc Showing diff from parent 8aa5f3e68c95 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
68
69
70
71
 
 
72
73
74
75
76
 
77
78
79
80
81
82
83
 
 
 
 
 
84
85
86
 
68
69
70
 
71
72
73
74
75
76
 
77
78
79
80
81
 
82
83
84
85
86
87
88
89
90
91
@@ -68,19 +68,24 @@
  self.undobtn = self.add_button(_('Undo'), RESPONSE_UNDO)   self.closebtn = self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)   - vlist = gtk.ListStore(str, bool) + vlist = gtk.ListStore(str, # tool name + bool) # separator   combo = gtk.ComboBoxEntry(vlist, 0)   self.mergetool = combo   combo.set_row_separator_func(lambda model, path: model[path][1])   combo.child.set_width_chars(8) - lbl = gtk.Label(_('Merge tool:')) + lbl = gtk.Label(_('Merge tools:'))   lbl.set_alignment(1, 0.5)   self.mergelabel = lbl   self.action_area.add(lbl)   self.action_area.add(combo) - vlist.append(('', False))   for tool in hglib.mergetools(repo.ui):   vlist.append((hglib.toutf(tool), False)) + mtool = repo.ui.config('ui', 'merge', None) + if mtool: + combo.child.set_text(hglib.toutf(mtool)) + else: + combo.child.set_text('')     # prepare to show   self.mergebtn.grab_focus()