diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-09-14 16:41:53 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-09-14 16:41:53 +0200 |
| commit | 6664fc59a8f296117ea98b943f062c0cc0e907c1 (patch) | |
| tree | b8e0bf218492291433d00a71122bc8cd2c662ea9 /lisp/vc | |
| parent | 74769e8b4c73f24e8f3356bd281a56a30000c648 (diff) | |
| parent | f3a30a50fab486dcaafb9d897797794fe4c3c4b3 (diff) | |
| download | emacs-6664fc59a8f296117ea98b943f062c0cc0e907c1.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-hg.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index c087a4d9e1f..689cd4d12bd 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -171,10 +171,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. @@ -199,7 +201,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 @@ -211,6 +213,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. |