* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):

Replace setting HGRCPATH to "" by some less invasive --config options.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66865dc0b8aa4a8a5445cf4f8211e33642b3ad48..7ab457a95fc48e97d7afe8f64b6fdf4b0f18f19f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-11  Sascha Wilde  <wilde@sha-bang.de>
+
+       * vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
+       Replace setting HGRCPATH to "" by some less invasive --config options.
+
 2010-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * font-lock.el (font-lock-beginning-of-syntax-function):

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index c1dc6eadd862d6269af9839f1dccd271210a0664..b29f229e26f131110af614e9c3c1bf85a2c157e0 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -170,10 +170,12 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                      (let ((process-environment
                             ;; Avoid localization of messages so we
                             ;; can parse the output.
-                            (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
+                            (append (list "TERM=dumb" "LANGUAGE=C")
                                     process-environment)))
                        (process-file
                         "hg" nil t nil
+                        "--config" "alias.status=status"
+                        "--config" "defaults.status="
                         "status" "-A" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
@@ -198,7 +200,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
       ((status nil)
        (default-directory (file-name-directory file))
        ;; Avoid localization of messages so we can parse the output.
-       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
+       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C")
                                     process-environment))
        (out
         (with-output-to-string
@@ -210,6 +212,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                        ;; Ignore all errors.
                        (process-file
                         "hg" nil t nil
+                        "--config" "alias.parents=parents"
+                        "--config" "defaults.parents="
                         "parents" "--template" "{rev}" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.