# HG changeset patch
# User Henrik Stuart <h...@hstuart.dk>
# Date 1258312092 -3600
# Branch stable
# Node ID 2886b54bf61d321786602840234e8f632c3f19dd
# Parent 04bdabdf74df87e6f8a2c34aaa506c4f43c1bcf3
merge: use ui.merge instead of deprecated HGMERGE to set merge tool
diff --git a/tortoisehg/hgtk/merge.py b/tortoisehg/hgtk/merge.py
--- a/tortoisehg/hgtk/merge.py
+++ b/tortoisehg/hgtk/merge.py
@@ -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)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
