Mercurial > emacs

comparison lisp/vc-cvs.el @ 91085:880960b70474

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
author Miles Bader <miles@gnu.org>
date Sun, 11 Nov 2007 00:56:44 +0000
parents 4b09bb044f38 613df1ba1584
children 53108e6cea98
comparison
equal deleted inserted replaced
91084:a4347a111894 91085:880960b70474
501 501
502 (defun vc-cvs-print-log (files &optional buffer) 502 (defun vc-cvs-print-log (files &optional buffer)
503 "Get change log associated with FILE." 503 "Get change log associated with FILE."
504 (vc-cvs-command 504 (vc-cvs-command
505 buffer 505 buffer
506 (if (and (vc-stay-local-p files) (fboundp 'start-process)) 'async 0) 506 (if (vc-stay-local-p files) 'async 0)
507 files "log")) 507 files "log"))
508 508
509 (defun vc-cvs-wash-log () 509 (defun vc-cvs-wash-log ()
510 "Remove all non-comment information from log output." 510 "Remove all non-comment information from log output."
511 (vc-call-backend 'RCS 'wash-log) 511 (vc-call-backend 'RCS 'wash-log)
512 nil) 512 nil)
513 513
514 (defun vc-cvs-diff (files &optional oldvers newvers buffer) 514 (defun vc-cvs-diff (files &optional oldvers newvers buffer)
515 "Get a difference report using CVS between two revisions of FILE." 515 "Get a difference report using CVS between two revisions of FILE."
516 (let* ((async (and (not vc-disable-async-diff) 516 (let* ((async (and (not vc-disable-async-diff)
517 (vc-stay-local-p files) 517 (vc-stay-local-p files)))
518 (fboundp 'start-process)))
519 (status (apply 'vc-cvs-command (or buffer "*vc-diff*") 518 (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
520 (if async 'async 1) 519 (if async 'async 1)
521 files "diff" 520 files "diff"
522 (and oldvers (concat "-r" oldvers)) 521 (and oldvers (concat "-r" oldvers))
523 (and newvers (concat "-r" newvers)) 522 (and newvers (concat "-r" newvers))
561 560
562 (defun vc-cvs-annotate-command (file buffer &optional revision) 561 (defun vc-cvs-annotate-command (file buffer &optional revision)
563 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER. 562 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
564 Optional arg REVISION is a revision to annotate from." 563 Optional arg REVISION is a revision to annotate from."
565 (vc-cvs-command buffer 564 (vc-cvs-command buffer
566 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 565 (if (vc-stay-local-p file)
567 'async 0) 566 'async 0)
568 file "annotate" 567 file "annotate"
569 (if revision (concat "-r" revision))) 568 (if revision (concat "-r" revision)))
570 ;; Strip the leading few lines. 569 ;; Strip the leading few lines.
571 (let ((proc (get-buffer-process buffer))) 570 (let ((proc (get-buffer-process buffer)))