diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0607f72f7e..c1e446c3138 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-11-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-hg.el (vc-hg-program): New var. + Suggested by Norman Gray <norman@astro.gla.ac.uk>. + (vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it. + 2010-11-17 Glenn Morris <rgm@gnu.org> * emacs-lisp/autoload.el (autoload-find-destination): The function diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 2339f887a34..52b74870427 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -133,6 +133,10 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :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 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (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 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (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 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (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 @@ REV is the revision to check out into WORKFILE." "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 |