[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100216: * vc-hg.el (vc-hg-program): New var.

[Stefan Monnier]

------------------------------------------------------------
revno: 100216
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-11-17 09:34:28 -0500
message:
  * vc-hg.el (vc-hg-program): New var.
  Suggested by Norman Gray <address@hidden>.
  (vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.
modified:
  lisp/ChangeLog
  lisp/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-17 03:47:16 +0000
+++ b/lisp/ChangeLog    2010-11-17 14:34:28 +0000
@@ -1,3 +1,9 @@
+2010-11-17  Stefan Monnier  <address@hidden>
+
+       * vc-hg.el (vc-hg-program): New var.
+       Suggested by Norman Gray <address@hidden>.
+       (vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.
+
 2010-11-17  Glenn Morris  <address@hidden>
 
        * emacs-lisp/autoload.el (autoload-find-destination): The function

=== modified file 'lisp/vc-hg.el'
--- a/lisp/vc-hg.el     2010-11-01 03:13:42 +0000
+++ b/lisp/vc-hg.el     2010-11-17 14:34:28 +0000
@@ -133,6 +133,10 @@
   :version "23.1"
   :group 'vc)
 
+(defcustom vc-hg-program "hg"
+  "Name of the Mercurial executable (excluding any arguments)."
+  :type 'string
+  :group 'vc)
 
 ;;; Properties of the backend
 
@@ -173,7 +177,7 @@
                             (append (list "TERM=dumb" "LANGUAGE=C")
                                     process-environment)))
                        (process-file
-                        "hg" nil t nil
+                        vc-hg-program nil t nil
                         "--config" "alias.status=status"
                         "--config" "defaults.status="
                         "status" "-A" (file-relative-name file)))
@@ -211,7 +215,7 @@
                      (let ((process-environment avoid-local-env))
                        ;; Ignore all errors.
                        (process-file
-                        "hg" nil t nil
+                        vc-hg-program nil t nil
                         "--config" "alias.parents=parents"
                         "--config" "defaults.parents="
                         "parents" "--template" "{rev}" (file-relative-name 
file)))
@@ -226,7 +230,7 @@
            (condition-case nil
                (let ((process-environment avoid-local-env))
                  (process-file
-                  "hg" nil nil nil
+                  vc-hg-program nil nil nil
                   ;; We use "log" here, if there's a faster command
                   ;; that returns true for an 'added file and false
                   ;; for an 'unregistered one, we could use that.
@@ -619,7 +623,7 @@
   "A wrapper around `vc-do-command' for use in vc-hg.el.
 The difference to vc-do-command is that this function always invokes `hg',
 and that it passes `vc-hg-global-switches' to it before FLAGS."
-  (apply 'vc-do-command (or buffer "*vc*") okstatus "hg" file-or-list
+  (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
          (if (stringp vc-hg-global-switches)
              (cons vc-hg-global-switches flags)
            (append vc-hg-global-switches