Mercurial > emacs
comparison lisp/vc-cvs.el @ 43727:1163adb21e5d
(vc-cvs-diff-tree): Fix typo in parameter names.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Tue, 05 Mar 2002 13:30:50 +0000 |
| parents | d4dab5e8395f |
| children | 0d10b436b5d5 |
comparison
equal
deleted
inserted
replaced
| 43726:6e4bed6ddee1 | 43727:1163adb21e5d |
|---|---|
| 3 ;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc. |
| 4 | 4 |
| 5 ;; Author: FSF (see vc.el for full credits) | 5 ;; Author: FSF (see vc.el for full credits) |
| 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 |
| 8 ;; $Id: vc-cvs.el,v 1.33 2002/02/21 20:16:47 spiegel Exp $ | 8 ;; $Id: vc-cvs.el,v 1.34 2002/02/25 22:03:24 spiegel Exp $ |
| 9 | 9 |
| 10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
| 11 | 11 |
| 12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
| 13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
| 395 (coding-system-for-write 'no-conversion)) | 395 (coding-system-for-write 'no-conversion)) |
| 396 (with-temp-file filename | 396 (with-temp-file filename |
| 397 (apply 'vc-do-command | 397 (apply 'vc-do-command |
| 398 (current-buffer) 0 "cvs" file | 398 (current-buffer) 0 "cvs" file |
| 399 "-Q" ; suppress diagnostic output | 399 "-Q" ; suppress diagnostic output |
| 400 "update" | 400 "update" |
| 401 (and rev (not (string= rev "")) | 401 (and rev (not (string= rev "")) |
| 402 (concat "-r" rev)) | 402 (concat "-r" rev)) |
| 403 "-p" | 403 "-p" |
| 404 switches))) | 404 switches))) |
| 405 (setq failed nil)) | 405 (setq failed nil)) |
| 596 `(let ((coding-system-for-read (vc-coding-system-for-diff ',f))) | 596 `(let ((coding-system-for-read (vc-coding-system-for-diff ',f))) |
| 597 ;; possible optimization: fetch the state of all files | 597 ;; possible optimization: fetch the state of all files |
| 598 ;; in the tree via vc-cvs-dir-state-heuristic | 598 ;; in the tree via vc-cvs-dir-state-heuristic |
| 599 (unless (vc-up-to-date-p ',f) | 599 (unless (vc-up-to-date-p ',f) |
| 600 (message "Looking at %s" ',f) | 600 (message "Looking at %s" ',f) |
| 601 (vc-diff-internal ',f ',rel1 ',rel2)))))) | 601 (vc-diff-internal ',f ',rev1 ',rev2)))))) |
| 602 ;; cvs diff: use a single call for the entire tree | 602 ;; cvs diff: use a single call for the entire tree |
| 603 (let ((coding-system-for-read | 603 (let ((coding-system-for-read |
| 604 (or coding-system-for-read 'undecided))) | 604 (or coding-system-for-read 'undecided))) |
| 605 (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff" | 605 (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff" |
| 606 (and rel1 (concat "-r" rel1)) | 606 (and rev1 (concat "-r" rev1)) |
| 607 (and rel2 (concat "-r" rel2)) | 607 (and rev2 (concat "-r" rev2)) |
| 608 (vc-diff-switches-list 'CVS)))))) | 608 (vc-diff-switches-list 'CVS)))))) |
| 609 | 609 |
| 610 (defun vc-cvs-annotate-command (file buffer &optional version) | 610 (defun vc-cvs-annotate-command (file buffer &optional version) |
| 611 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER. | 611 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER. |
| 612 Optional arg VERSION is a version to annotate from." | 612 Optional arg VERSION is a version to annotate from." |