aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-12-14 17:12:18 +0000
committerDan Nicolaescu2009-12-14 17:12:18 +0000
commit110de3bb16877fc9ffcf2e89a7d7438315197ac2 (patch)
treea84c52d66aaeccdb83f07556f93864ef772ec490
parent86b5e14c2d5e62d26fae6b0796e4e3c73769d2c5 (diff)
downloademacs-110de3bb16877fc9ffcf2e89a7d7438315197ac2.tar.gz
emacs-110de3bb16877fc9ffcf2e89a7d7438315197ac2.zip
(vc-hg-working-revision): Make sure the command is executed in a
known environment so that we can parse the output. (Bug#4417)
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-hg.el12
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 149cb6c7b22..a1d81fb1873 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
12009-12-14 Dan Nicolaescu <dann@ics.uci.edu> 12009-12-14 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-hg.el (vc-hg-print-log): Fix argument order. 3 * vc-hg.el (vc-hg-print-log): Fix argument order.
4 (vc-hg-working-revision): Make sure the command is executed in a
5 known environment so that we can parse the output. (Bug#4417)
4 6
52009-12-14 Chong Yidong <cyd@stupidchicken.com> 72009-12-14 Chong Yidong <cyd@stupidchicken.com>
6 8
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 5a90b66e8b5..91e9d682f88 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -202,10 +202,14 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
202 standard-output 202 standard-output
203 (setq status 203 (setq status
204 (condition-case nil 204 (condition-case nil
205 ;; Ignore all errors. 205 (let ((process-environment
206 (process-file 206 ;; Avoid localization of messages so we can parse the output.
207 "hg" nil t nil 207 (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
208 "log" "-l1" (file-relative-name file)) 208 process-environment)))
209 ;; Ignore all errors.
210 (process-file
211 "hg" nil t nil
212 "log" "-l1" (file-relative-name file)))
209 ;; Some problem happened. E.g. We can't find an `hg' 213 ;; Some problem happened. E.g. We can't find an `hg'
210 ;; executable. 214 ;; executable.
211 (error nil))))))) 215 (error nil)))))))