[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99767: Fix hg envvar handling (Bug#5846).

[Chong Yidong]

------------------------------------------------------------
revno: 99767
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-04-20 11:57:54 -0400
message:
  Fix hg envvar handling (Bug#5846).
  
  * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
  (vc-hg-working-revision): Likewise.  Use hg parents, not hg parent
  (Bug#5846).
modified:
  lisp/ChangeLog
  lisp/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-20 07:54:28 +0000
+++ b/lisp/ChangeLog    2010-04-20 15:57:54 +0000
@@ -1,3 +1,9 @@
+2010-04-20  Dan Nicolaescu  <address@hidden>
+
+       * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
+       (vc-hg-working-revision): Likewise.  Use hg parents, not hg parent
+       (Bug#5846).
+
 2010-04-20  Glenn Morris  <address@hidden>
 
        * emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.

=== modified file 'lisp/vc-hg.el'
--- a/lisp/vc-hg.el     2010-04-17 16:10:19 +0000
+++ b/lisp/vc-hg.el     2010-04-20 15:57:54 +0000
@@ -168,12 +168,13 @@
                   (condition-case nil
                       ;; Ignore all errors.
                      (let ((process-environment
-                            ;; Avoid localization of messages so we can parse 
the output.
-                            (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") 
process-environment)))
-
-                     (process-file
-                       "hg" nil t nil
-                       "status" "-A" (file-relative-name file)))
+                            ;; Avoid localization of messages so we
+                            ;; can parse the output.
+                            (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
+                                    process-environment)))
+                       (process-file
+                        "hg" nil t nil
+                        "status" "-A" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))
@@ -197,7 +198,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" "HGRC=")
+       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
                                     process-environment))
        (out
         (with-output-to-string
@@ -209,7 +210,7 @@
                        ;; Ignore all errors.
                        (process-file
                         "hg" nil t nil
-                        "parent" "--template" "{rev}" (file-relative-name 
file)))
+                        "parents" "--template" "{rev}" (file-relative-name 
file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))