From 5ceaac0c61ab70280a67588eeb8536fcddc3f9be Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 10 Mar 2011 00:32:27 -0800 Subject: [PATCH] * lisp/vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program. --- lisp/ChangeLog | 2 ++ lisp/vc/vc-hg.el | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c8890a926be..da61e7025ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-03-10 Glenn Morris + * vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program. + * vc/vc-git.el (vc-git-program): New option. (vc-git-branches, vc-git-pull, vc-git-merge-branch, vc-git-command) (vc-git--call): Use it. diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index d283c39362a..4ac7ef15fc7 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -663,14 +663,15 @@ then attempts to update the working directory." (let* ((root (vc-hg-root default-directory)) (buffer (format "*vc-hg : %s*" (expand-file-name root))) (command "pull") - (hg-program "hg") + (hg-program vc-hg-program) ;; Fixme: before updating the working copy to the latest ;; state, should check if it's visiting an old revision. (args '("-u"))) ;; If necessary, prompt for the exact command. (when prompt (setq args (split-string - (read-shell-command "Run Hg (like this): " "hg pull -u" + (read-shell-command "Run Hg (like this): " + (format "%s pull -u" hg-program) 'vc-hg-history) " " t)) (setq hg-program (car args) @@ -685,7 +686,7 @@ then attempts to update the working directory." This runs the command \"hg merge\"." (let* ((root (vc-hg-root default-directory)) (buffer (format "*vc-hg : %s*" (expand-file-name root)))) - (apply 'vc-do-async-command buffer root "hg" '("merge")) + (apply 'vc-do-async-command buffer root vc-hg-program '("merge")) (vc-set-async-update buffer))) ;;; Internal functions -- 2.39.2