aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc-hg.el15
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 @@
126 :version "22.2" 126 :version "22.2"
127 :group 'vc) 127 :group 'vc)
128 128
129(defcustom vc-hg-diff-switches
130 t ; Hg doesn't support common args like -u
131 "String or list of strings specifying extra switches for Hg diff under VC.
132If nil, use the value of `vc-diff-switches'.
133If you want to force an empty list of arguments, use t."
134 :type '(choice (const :tag "Unspecified" nil)
135 (const :tag "None" t)
136 (string :tag "Argument String")
137 (repeat :tag "Argument List"
138 :value ("")
139 string))
140 :version "23.1"
141 :group 'vc)
142
129 143
130;;; Properties of the backend 144;;; Properties of the backend
131 145
@@ -262,6 +276,7 @@
262 (expand-file-name default-directory)) 276 (expand-file-name default-directory))
263 "diff" 277 "diff"
264 (append 278 (append
279 (vc-switches (if vc-hg-diff-switches 'hg) 'diff)
265 (when oldvers 280 (when oldvers
266 (if newvers 281 (if newvers
267 (list "-r" oldvers "-r" newvers) 282 (list "-r" oldvers "-r" newvers)