Mercurial > emacs
changeset 110346:05bd64a0d747
* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
Replace setting HGRCPATH to "" by some less invasive --config options.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 11 Sep 2010 15:25:48 +0200 |
| parents | 9fae9dc41486 |
| children | b4971a8966f0 |
| files | lisp/ChangeLog lisp/vc-hg.el |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 11 15:00:19 2010 +0200 +++ b/lisp/ChangeLog Sat Sep 11 15:25:48 2010 +0200 @@ -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):
--- a/lisp/vc-hg.el Sat Sep 11 15:00:19 2010 +0200 +++ b/lisp/vc-hg.el Sat Sep 11 15:25:48 2010 +0200 @@ -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.