* international/characters.el (?1, ?2, ?3, ?4, ?7, ?^):

[gnu-emacs] / lisp / vc-hg.el

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 35ff589f9f0468a31024c2391468b8cf4cd2ac7f..d47df2a7b3f0428ebeb7bbe8d332772d96606aea 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -1,6 +1,6 @@
 ;;; vc-hg.el --- VC backend for the mercurial version control system
 
-;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: Ivan Kanis
 ;; Keywords: tools
@@ -44,8 +44,8 @@
 ;; - state-heuristic (file)                    NOT NEEDED
 ;; - dir-status (dir update-function)          OK
 ;; - dir-status-files (dir files ds uf)        OK
-;; - dir-extra-headers (dir)                OK
-;; - dir-printer (fileinfo)                 OK
+;; - dir-extra-headers (dir)                   OK
+;; - dir-printer (fileinfo)                    OK
 ;; * working-revision (file)                   OK
 ;; - latest-on-branch-p (file)                 ??
 ;; * checkout-model (files)                    OK
@@ -80,8 +80,8 @@
 ;; - annotate-current-time ()                  NOT NEEDED
 ;; - annotate-extract-revision-at-line ()      OK
 ;; TAG SYSTEM
-;; - create-tag (dir name branchp)       NEEDED
-;; - retrieve-tag (dir name update)       NEEDED
+;; - create-tag (dir name branchp)             NEEDED
+;; - retrieve-tag (dir name update)            NEEDED
 ;; MISCELLANEOUS
 ;; - make-version-backups-p (file)             ??
 ;; - repository-hostname (dirname)             ??
@@ -116,33 +116,21 @@
 
 ;;; 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."
+  "Global switches to pass to any Hg command."
   :type '(choice (const :tag "None" nil)
          (string :tag "Argument String")
-         (repeat :tag "Argument List"
-             :value ("")
-             string))
+         (repeat :tag "Argument List" :value ("") string))
   :version "22.2"
   :group 'vc)
 
-(defcustom vc-hg-diff-switches
-  t                           ; Hg doesn't support common args like -u
-  "String or list of strings specifying extra switches for Hg diff under VC.
-If nil, use the value of `vc-diff-switches'.
-If you want to force an empty list of arguments, use t."
+(defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u
+  "String or list of strings specifying switches for Hg diff under VC.
+If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :type '(choice (const :tag "Unspecified" nil)
                 (const :tag "None" t)
                 (string :tag "Argument String")
-                (repeat :tag "Argument List"
-                        :value ("")
-                        string))
+                (repeat :tag "Argument List" :value ("") string))
   :version "23.1"
   :group 'vc)
 
@@ -180,8 +168,7 @@ If you want to force an empty list of arguments, use t."
                  (condition-case nil
                      ;; Ignore all errors.
                      (call-process
-                      vc-hg-program nil t nil
-                       "--cwd" (file-name-directory file)
+                      "hg" 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.
@@ -212,8 +199,7 @@ If you want to force an empty list of arguments, use t."
                  (condition-case nil
                      ;; Ignore all errors.
                      (call-process
-                      vc-hg-program nil t nil
-                       "--cwd" (file-name-directory file)
+                      "hg" 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.
@@ -273,18 +259,19 @@ If you want to force an empty list of arguments, use t."
 (defun vc-hg-diff (files &optional oldvers newvers buffer)
   "Get a difference report using hg between two revisions of FILES."
   (let* ((firstfile (car files))
+        (cwd (if firstfile (file-name-directory firstfile)
+               (expand-file-name default-directory)))
         (working (and firstfile (vc-working-revision firstfile))))
     (when (and (equal oldvers working) (not newvers))
       (setq oldvers nil))
     (when (and (not oldvers) newvers)
       (setq oldvers working))
     (apply #'vc-hg-command (or buffer "*vc-diff*") nil
-          (mapcar (lambda (file) (file-name-nondirectory file)) files)
-          "--cwd" (or (when firstfile (file-name-directory firstfile))
-                      (expand-file-name default-directory))
+          (mapcar (lambda (file) (file-relative-name file cwd)) files)
+          "--cwd" cwd
           "diff"
           (append
-           (vc-switches (if vc-hg-diff-switches 'hg) 'diff)
+           (vc-switches 'hg 'diff)
            (when oldvers
              (if newvers
                  (list "-r" oldvers "-r" newvers)
@@ -605,9 +592,9 @@ REV is the revision to check out into WORKFILE."
 
 (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
-`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
+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
          (if (stringp vc-hg-global-switches)
              (cons vc-hg-global-switches flags)
            (append vc-hg-global-switches