(vc-hg-diff-switches): New option.

(vc-hg-diff): Apply diff switches.  (Bug#1017)

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index cad3ebbbb8469216ba22b89c7aab02f58a8f5790..aa11495441afa9b6707296ee7ed15899046f486d 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -126,6 +126,20 @@
   :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."
+  :type '(choice (const :tag "Unspecified" nil)
+                (const :tag "None" t)
+                (string :tag "Argument String")
+                (repeat :tag "Argument List"
+                        :value ("")
+                        string))
+  :version "23.1"
+  :group 'vc)
+
 \f
 ;;; Properties of the backend
 
@@ -262,6 +276,7 @@
                       (expand-file-name default-directory))
           "diff"
           (append
+           (vc-switches (if vc-hg-diff-switches 'hg) 'diff)
            (when oldvers
              (if newvers
                  (list "-r" oldvers "-r" newvers)