Henrik Stuart avatar Henrik Stuart committed 7129656

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

Comments (0)

Files changed (1)

tortoisehg/hgtk/merge.py

         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)
                 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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.