[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100031: * vc/vc-hg.el (vc-hg-state, vc-hg-working-revision):

[Stefan Monnier]

------------------------------------------------------------
revno: 100031
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-09-11 15:25:48 +0200
message:
  * vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
  Replace setting HGRCPATH to "" by some less invasive --config options.
modified:
  lisp/ChangeLog
  lisp/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-11 13:00:19 +0000
+++ b/lisp/ChangeLog    2010-09-11 13:25:48 +0000
@@ -1,3 +1,8 @@
+2010-09-11  Sascha Wilde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * font-lock.el (font-lock-beginning-of-syntax-function):

=== modified file 'lisp/vc-hg.el'
--- a/lisp/vc-hg.el     2010-04-20 15:57:54 +0000
+++ b/lisp/vc-hg.el     2010-09-11 13:25:48 +0000
@@ -170,10 +170,12 @@
                      (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 @@
       ((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 @@
                        ;; 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.