procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* vc-hg.el (vc-hg-program): New var.

Browse source 
Suggested by Norman Gray <norman@astro.gla.ac.uk>.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.
This commit is contained in:
Stefan Monnier 2010-11-17 09:34:28 -05:00
parent 4c0eb0d3db
commit 88bf1becf8
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

12
lisp/vc-hg.el
View file

@ -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