Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.1.9, and 1.1.9.1

stable merge: hide merge tool controls, group with dummy merge

Changeset 8fa351776ba3…

Parent 57810081c7a3…

by Wagner Bruna

Changes to one file · Browse files at 8fa351776ba3 Showing diff from parent 57810081c7a3 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
93
94
95
96
97
98
99
100
 
101
102
103
104
105
106
107
108
109
110
111
 
 
 
 
112
113
114
 
120
121
122
 
 
 
 
 
123
124
125
 
93
94
95
 
 
 
 
 
96
97
98
99
100
101
 
 
 
 
 
 
102
103
104
105
106
107
108
 
114
115
116
117
118
119
120
121
122
123
124
@@ -93,22 +93,16 @@
  # layout table for advanced options   table = gtklib.LayoutTable()   expander.add(table) - discard = gtk.CheckButton(_('Discard all changes from merge target ' - '(other) revision')) - self.discard = discard - table.add_row(discard) - +   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 tools:')) - lbl.set_alignment(1, 0.5) - self.mergelabel = lbl - self.action_area.add(lbl) - self.action_area.add(combo) + combo.child.set_width_chars(16) + chtool = gtk.RadioButton(None, _('Use merge tool:')) + self.mergelabel = chtool + table.add_row(chtool, combo)   prev = False   for tool in hglib.mergetools(self.repo.ui):   cur = tool.startswith('internal:') @@ -120,6 +114,11 @@
  else:   combo.child.set_text('')   + discard = gtk.RadioButton(chtool, + _('Discard all changes from merge target (other) revision')) + self.discard = discard + table.add_row(discard) +   # prepare to show   if len(self.repo.parents()) == 2:   self.mergetool.set_sensitive(False)