Mercurial > emacs
comparison lisp/vc-bzr.el @ 98464:75e08f08f5e5
(vc-bzr-diff): Use vc-switches rather than the obsolete vc-diff-switches.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 02 Oct 2008 17:31:52 +0000 |
| parents | 962e4709829b |
| children | 622e1277bbf2 |
comparison
equal
deleted
inserted
replaced
| 98463:bc0b0571f554 | 98464:75e08f08f5e5 |
|---|---|
| 483 (defun vc-bzr-diff (files &optional rev1 rev2 buffer) | 483 (defun vc-bzr-diff (files &optional rev1 rev2 buffer) |
| 484 "VC bzr backend for diff." | 484 "VC bzr backend for diff." |
| 485 ;; `bzr diff' exits with code 1 if diff is non-empty. | 485 ;; `bzr diff' exits with code 1 if diff is non-empty. |
| 486 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files | 486 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files |
| 487 "--diff-options" (mapconcat 'identity | 487 "--diff-options" (mapconcat 'identity |
| 488 (vc-diff-switches-list bzr) | 488 (vc-switches 'bzr 'diff) |
| 489 " ") | 489 " ") |
| 490 ;; This `when' is just an optimization because bzr-1.2 is *much* | 490 ;; This `when' is just an optimization because bzr-1.2 is *much* |
| 491 ;; faster when the revision argument is not given. | 491 ;; faster when the revision argument is not given. |
| 492 (when (or rev1 rev2) | 492 (when (or rev1 rev2) |
| 493 (list "-r" (format "%s..%s" | 493 (list "-r" (format "%s..%s" |