diff options
| author | Stefan Monnier <[email protected]> | 2010-09-11 15:25:48 +0200 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2010-09-11 15:25:48 +0200 |
| commit | 681b88dd81e6cfd792dcf80404d7c51381a59ff1 (patch) | |
| tree | 9f6a5b5038391f8fbe32ef99b8d0baff720c34de | |
| parent | 71e657fcb81573e0d9fd0c909dbf095669258787 (diff) | |
* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
Replace setting HGRCPATH to "" by some less invasive --config options.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66865dc0b8..7ab457a95f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-11 Sascha Wilde <[email protected]> + + * 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 <[email protected]> * font-lock.el (font-lock-beginning-of-syntax-function): diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index c1dc6eadd8..b29f229e26 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -170,10 +170,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. @@ -198,7 +200,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 @@ -210,6 +212,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. |