Mercurial > hg > pyhgsh

diff mercurial/localrepo.py @ 1885:c4d577262d00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 11 Mar 2006 21:33:19 -0800
parents b98160cfb2f3
children 6569651a4f1e
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Mar 10 23:34:36 2006 -0800
+++ b/mercurial/localrepo.py	Sat Mar 11 21:33:19 2006 -0800
@@ -1702,9 +1702,8 @@
 
         cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
                or "hgmerge")
-        r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c),
-                        environ={'HG_ROOT': self.root,
-                                 'HG_FILE': fn,
+        r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=self.root,
+                        environ={'HG_FILE': fn,
                                  'HG_MY_NODE': p1,
                                  'HG_OTHER_NODE': p2,
                                  'HG_FILE_MY_NODE': hex(my),