• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.9.5/emacs-92/emacs/lisp/

Lines Matching +defs:diff +defs:switches

46 (defcustom vc-svn-global-switches nil
47 "*Global switches to pass to any SVN command."
56 (defcustom vc-svn-register-switches nil
57 "*Extra switches for registering a file into SVN.
68 (defcustom vc-svn-diff-switches
70 "String or list of strings specifying extra switches for svn diff under VC.
71 If nil, use the value of `vc-diff-switches'.
213 `vc-register-switches' and `vc-svn-register-switches' are passed to
215 (apply 'vc-svn-command nil 0 file "add" (vc-switches 'SVN 'register)))
232 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
260 (vc-switches 'SVN 'checkout)))
265 (vc-call update file editable rev (vc-switches 'SVN 'checkout)))
269 (defun vc-svn-update (file editable rev switches)
283 switches)))
382 (defun vc-svn-diff (file &optional oldvers newvers buffer)
384 (unless buffer (setq buffer "*vc-diff*"))
395 ;; Note: this is NOT a "svn diff".
397 1 "diff" file
398 (append (vc-switches nil 'diff) '("/dev/null")))
401 (let* ((switches
402 (if vc-svn-diff-switches
403 (vc-switches 'SVN 'diff)
404 (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
405 (async (and (not vc-disable-async-diff)
411 file "diff"
413 switches
417 (if async 1 ; async diff => pessimistic assumption
418 ;; For some reason `svn diff' does not return a useful
419 ;; status w.r.t whether the diff was empty or not.
422 (defun vc-svn-diff-tree (dir &optional rev1 rev2)
424 (vc-svn-diff (file-name-as-directory dir) rev1 rev2))
470 and that it passes `vc-svn-global-switches' to it before FLAGS."
472 (if (stringp vc-svn-global-switches)
473 (cons vc-svn-global-switches flags)
474 (append vc-svn-global-switches