[Emacs-diffs] /srv/bzr/emacs/trunk r103616: * lisp/vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.

[Glenn Morris]

------------------------------------------------------------
revno: 103616
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-10 00:32:27 -0800
message:
  * lisp/vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.
modified:
  lisp/ChangeLog
  lisp/vc/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-10 08:26:41 +0000
+++ b/lisp/ChangeLog    2011-03-10 08:32:27 +0000
@@ -1,5 +1,7 @@
 2011-03-10  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/vc/vc-hg.el'
--- a/lisp/vc/vc-hg.el  2011-02-14 01:49:24 +0000
+++ b/lisp/vc/vc-hg.el  2011-03-10 08:32:27 +0000
@@ -663,14 +663,15 @@
       (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 @@
 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