mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix hg envvar handling (Bug#5846).

Browse source 
* vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
(vc-hg-working-revision): Likewise.  Use hg parents, not hg parent
(Bug#5846).
This commit is contained in:
Chong Yidong 2010-04-20 11:57:54 -04:00
parent 0ca1259846
commit 808ecc4e18
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2010-04-20 Dan Nicolaescu <dann@ics.uci.edu>
* 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 <rgm@gnu.org>
* emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.

17
lisp/vc-hg.el
View file

@ -168,12 +168,13 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(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 @@ 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" "HGRC=")
(avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
process-environment))
(out
(with-output-to-string
@ -209,7 +210,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
;; 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)))))))