Merge pull request #98 from RonnyPfannschmidt/reenable-hgrcpath

allow HGRCPATH env var - potentially fixes #97

Author: RonnyPfannschmidt

setuptools_scm/utils.py

@@ -50,8 +50,6 @@ def do_ex(cmd, cwd='.'):
         cwd=str(cwd),
         env=_always_strings(dict(
             os.environ,
-            # disable hgrc processing other than .hg/hgrc
-            HGRCPATH='',
             # try to disable i18n
             LC_ALL='C',
             LANGUAGE='',

testing/test_mercurial.py

@@ -93,5 +93,5 @@ def test_version_in_merge(wd):
     wd.commit_testfile()
     wd('hg up 0')
     wd.commit_testfile()
-    wd('hg merge')
+    wd('hg merge --tool :merge')
     assert wd.version is not None