Mercurial > emacs
comparison lisp/vc-mcvs.el @ 86002:613df1ba1584
* vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
* vc-svn.el (vc-svn-print-log, vc-svn-diff):
* vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command):
* vc-cvs.el (vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-annotate-command):
* vc-arch.el (vc-arch-diff): Remove test to check if start-process
is bound, it always is.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 10 Nov 2007 05:22:16 +0000 |
parents | 43a9834cf1a6 |
children | f358a2fd5895 880960b70474 |
comparison
equal
deleted
inserted
replaced
86001:8845ad7f1ea3 | 86002:613df1ba1584 |
---|---|
441 (let ((default-directory (vc-mcvs-root (car files)))) | 441 (let ((default-directory (vc-mcvs-root (car files)))) |
442 ;; Run the command from the root dir so that `mcvs filt' returns | 442 ;; Run the command from the root dir so that `mcvs filt' returns |
443 ;; valid relative names. | 443 ;; valid relative names. |
444 (vc-mcvs-command | 444 (vc-mcvs-command |
445 buffer | 445 buffer |
446 (if (and (vc-stay-local-p files) (fboundp 'start-process)) 'async 0) | 446 (if (vc-stay-local-p files) 'async 0) |
447 files "log"))) | 447 files "log"))) |
448 | 448 |
449 (defun vc-mcvs-diff (files &optional oldvers newvers buffer) | 449 (defun vc-mcvs-diff (files &optional oldvers newvers buffer) |
450 "Get a difference report using Meta-CVS between two revisions of FILES." | 450 "Get a difference report using Meta-CVS between two revisions of FILES." |
451 (let* ((async (and (not vc-disable-async-diff) | 451 (let* ((async (and (not vc-disable-async-diff) |
452 (vc-stay-local-p files) | 452 (vc-stay-local-p files))) |
453 (fboundp 'start-process))) | |
454 ;; Run the command from the root dir so that `mcvs filt' returns | 453 ;; Run the command from the root dir so that `mcvs filt' returns |
455 ;; valid relative names. | 454 ;; valid relative names. |
456 (default-directory (vc-mcvs-root (car files))) | 455 (default-directory (vc-mcvs-root (car files))) |
457 (status | 456 (status |
458 (apply 'vc-mcvs-command (or buffer "*vc-diff*") | 457 (apply 'vc-mcvs-command (or buffer "*vc-diff*") |
466 (defun vc-mcvs-annotate-command (file buffer &optional revision) | 465 (defun vc-mcvs-annotate-command (file buffer &optional revision) |
467 "Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER. | 466 "Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER. |
468 Optional arg REVISION is a revision to annotate from." | 467 Optional arg REVISION is a revision to annotate from." |
469 (vc-mcvs-command | 468 (vc-mcvs-command |
470 buffer | 469 buffer |
471 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) | 470 (if (vc-stay-local-p file) 'async 0) |
472 file "annotate" (if revision (concat "-r" revision))) | 471 file "annotate" (if revision (concat "-r" revision))) |
473 (with-current-buffer buffer | 472 (with-current-buffer buffer |
474 (goto-char (point-min)) | 473 (goto-char (point-min)) |
475 (re-search-forward "^[0-9]") | 474 (re-search-forward "^[0-9]") |
476 (delete-region (point-min) (1- (point))))) | 475 (delete-region (point-min) (1- (point))))) |