Merge changes from emacs-23 branch.

[bpt/emacs.git] / lisp / vc / vc-hg.el

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index c087a4d..689cd4d 100644 (file)
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -171,10 +171,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.
@@ -199,7 +201,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
@@ -211,6 +213,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.