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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index cad3ebbbb84..aa11495441a 100644
--- 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)
+
 
 ;;; 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)