summaryrefslogtreecommitdiff
path: root/lisp/vc-hg.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-11-20 02:43:45 +0000
committerGlenn Morris <rgm@gnu.org>2008-11-20 02:43:45 +0000
commit82ee74d6f5b71d9fa30a22b7accc80ae3819aa3e (patch)
tree881bc604481814306f7281fa308297d77243c877 /lisp/vc-hg.el
parent216d81a1e617376ccb2f3b19582f5ed39538585d (diff)
downloademacs-82ee74d6f5b71d9fa30a22b7accc80ae3819aa3e.tar.gz
(vc-hg-diff-switches): New option.
(vc-hg-diff): Apply diff switches. (Bug#1017)
Diffstat (limited to 'lisp/vc-hg.el')
-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 @@
: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)