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: ease name conflict

commit was the module name, button name, and function name.
Reduce that to just the first two

Changeset 71ae758acce0…

Parent 6e2dad43ff14…

by Steve Borho

Changes to one file · Browse files at 71ae758acce0 Showing diff from parent 6e2dad43ff14 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
99
100
101
102
 
103
104
105
 
133
134
135
136
 
137
138
139
 
99
100
101
 
102
103
104
105
 
133
134
135
 
136
137
138
139
@@ -99,7 +99,7 @@
  for tool in hglib.mergetools(repo.ui):   vlist.append((hglib.toutf(tool), False))   - commit.connect('clicked', self.commit) + commit.connect('clicked', self.docommit)   undo.connect('clicked', self.undo, local, merge, commit)   merge.connect('clicked', self.merge, other, commit, undo)   merge.grab_focus() @@ -133,7 +133,7 @@
  commit.set_sensitive(True)   commit.grab_focus()   - def commit(self, button): + def docommit(self, button):   dlg = commit.run(ui.ui())   dlg.set_transient_for(self)   dlg.set_modal(True)