Mercurial > emacs

comparison lisp/vc-bzr.el @ 106732:d804f575197b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-bzr-diff): Obey vc-disable-async-diff.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 04 Jan 2010 23:46:35 -0800
parents b4d5ac4906a0
children debedd261607
comparison
equal deleted inserted replaced
106731:79fa2d910b72 106732:d804f575197b
530 found))) 530 found)))
531 531
532 (defun vc-bzr-diff (files &optional rev1 rev2 buffer) 532 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
533 "VC bzr backend for diff." 533 "VC bzr backend for diff."
534 ;; `bzr diff' exits with code 1 if diff is non-empty. 534 ;; `bzr diff' exits with code 1 if diff is non-empty.
535 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files 535 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
536 (if vc-disable-async-diff 1 'async) files
536 "--diff-options" (mapconcat 'identity 537 "--diff-options" (mapconcat 'identity
537 (vc-switches 'bzr 'diff) 538 (vc-switches 'bzr 'diff)
538 " ") 539 " ")
539 ;; This `when' is just an optimization because bzr-1.2 is *much* 540 ;; This `when' is just an optimization because bzr-1.2 is *much*
540 ;; faster when the revision argument is not given. 541 ;; faster when the revision argument is not given.