changeset 99783:ebd796cf6d88

(vc-hg-program): New option. (vc-hg-state, vc-hg-working-revision, vc-hg-command): Use vc-hg-program rather than hard-coded "hg".
author Glenn Morris <rgm@gnu.org>
date Sat, 22 Nov 2008 03:29:03 +0000
parents 6be2d2932794
children 248f432fca05
files lisp/vc-hg.el
diffstat 1 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-hg.el	Sat Nov 22 03:27:18 2008 +0000
+++ b/lisp/vc-hg.el	Sat Nov 22 03:29:03 2008 +0000
@@ -116,6 +116,12 @@
 
 ;;; Customization options
 
+(defcustom vc-hg-program "hg"
+  "Name of the Hg executable."
+  :type 'string
+  :version "23.1"
+  :group 'vc)
+
 (defcustom vc-hg-global-switches nil
   "*Global switches to pass to any Hg command."
   :type '(choice (const :tag "None" nil)
@@ -174,7 +180,8 @@
 		  (condition-case nil
 		      ;; Ignore all errors.
 		      (call-process
-		       "hg" nil t nil "--cwd" (file-name-directory file)
+		       vc-hg-program nil t nil
+                       "--cwd" (file-name-directory file)
 		       "status" "-A" (file-name-nondirectory file))
 		    ;; Some problem happened.  E.g. We can't find an `hg'
 		    ;; executable.
@@ -205,7 +212,8 @@
 		  (condition-case nil
 		      ;; Ignore all errors.
 		      (call-process
-		       "hg" nil t nil "--cwd" (file-name-directory file)
+		       vc-hg-program nil t nil
+                       "--cwd" (file-name-directory file)
 		       "log" "-l1" (file-name-nondirectory file))
 		    ;; Some problem happened.  E.g. We can't find an `hg'
 		    ;; executable.
@@ -597,9 +605,9 @@
 
 (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
   "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
+The difference to vc-do-command is that this function always invokes
+`vc-hg-program', and that it passes `vc-hg-global-switches' to it before FLAGS."
+  (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