Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable merge: use ui.merge instead of deprecated HGMERGE to set merge tool

Changeset 7129656cc09c…

Parent 1c73f091e55b…

by Henrik Stuart

Changes to one file · Browse files at 7129656cc09c Showing diff from parent 1c73f091e55b Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
211
212
213
214
215
216
217
218
 
 
 
 
219
220
221
 
230
231
232
233
234
235
236
237
238
239
240
 
211
212
213
 
214
215
 
 
216
217
218
219
220
221
222
 
231
232
233
 
 
 
 
 
234
235
236
@@ -211,11 +211,12 @@
  self.abortbtn.set_property('visible', working)     def domerge(self): - cmdline = ['hg', 'merge', '--rev', self.otherrev]   tool = hglib.fromutf(self.mergetool.child.get_text())   if tool: - oldmergeenv = os.environ.get('HGMERGE') - os.environ['HGMERGE'] = tool + cmdline = ['hg', '--config', 'ui.merge=%s' % tool] + else: + cmdline = ['hg'] + cmdline.extend(['merge', '--rev', self.otherrev])     def cmd_done(returncode, useraborted):   self.switch_to(MODE_NORMAL, cmd=False) @@ -230,11 +231,6 @@
  self.cmd.set_result(_('Failed to merge'), style='error')   if len(repo.parents()) == 1:   return - if tool: - if oldmergeenv: - os.environ['HGMERGE'] = oldmergeenv - else: - del os.environ['HGMERGE']   self.mergetool.set_sensitive(False)   self.mergelabel.set_sensitive(False)   self.mergebtn.set_sensitive(False)