[Emacs-diffs] emacs/lisp ChangeLog vc-hg.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/12/14 17:12:21

Modified files:
        lisp           : ChangeLog vc-hg.el 

Log message:
        (vc-hg-working-revision): Make sure the command is executed in a
        known environment so that we can parse the output.  (Bug#4417)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16905&r2=1.16906
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hg.el?cvsroot=emacs&r1=1.109&r2=1.110

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16905
retrieving revision 1.16906
diff -u -b -r1.16905 -r1.16906
--- ChangeLog   14 Dec 2009 16:55:34 -0000      1.16905
+++ ChangeLog   14 Dec 2009 17:12:18 -0000      1.16906
@@ -1,6 +1,8 @@
 2009-12-14  Dan Nicolaescu  <address@hidden>
 
        * vc-hg.el (vc-hg-print-log): Fix argument order.
+       (vc-hg-working-revision): Make sure the command is executed in a
+       known environment so that we can parse the output.  (Bug#4417)
 
 2009-12-14  Chong Yidong  <address@hidden>
 

Index: vc-hg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- vc-hg.el    14 Dec 2009 16:55:37 -0000      1.109
+++ vc-hg.el    14 Dec 2009 17:12:21 -0000      1.110
@@ -202,10 +202,14 @@
               standard-output
             (setq status
                   (condition-case nil
+                     (let ((process-environment
+                            ;; Avoid localization of messages so we can parse 
the output.
+                            (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
+                                    process-environment)))
                       ;; Ignore all errors.
                       (process-file
                        "hg" nil t nil
-                       "log" "-l1" (file-relative-name file))
+                        "log" "-l1" (file-relative-name file)))
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))