Mercurial > emacs
changeset 48965:322a31d667aa
(vc-cvs-checkout): Handle t argument for REV.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Thu, 26 Dec 2002 14:05:48 +0000 |
| parents | 7bba5b5ff0d2 |
| children | a327c58de610 |
| files | lisp/vc-cvs.el |
| diffstat | 1 files changed, 23 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Thu Dec 26 14:04:21 2002 +0000 +++ b/lisp/vc-cvs.el Thu Dec 26 14:05:48 2002 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-cvs.el,v 1.48 2002/10/11 06:47:49 miles Exp $ +;; $Id: vc-cvs.el,v 1.49 2002/10/17 15:43:48 lektu Exp $ ;; This file is part of GNU Emacs. @@ -421,7 +421,8 @@ (current-buffer) 0 file "-Q" ; suppress diagnostic output "update" - (and rev (not (string= rev "")) + (and (stringp rev) + (not (string= rev "")) (concat "-r" rev)) "-p" switches))) @@ -438,26 +439,26 @@ (if (and (file-exists-p file) (not rev)) ;; If no revision was specified, just make the file writable ;; if necessary (using `cvs-edit' if requested). - (and editable (not (eq (vc-cvs-checkout-model file) 'implicit)) - (if vc-cvs-use-edit - (vc-cvs-command nil 0 file "edit") - (set-file-modes file (logior (file-modes file) 128)) - (if file-buffer (toggle-read-only -1)))) - ;; Check out a particular version (or recreate the file). - (vc-file-setprop file 'vc-workfile-version nil) - (apply 'vc-cvs-command nil 0 file - (and editable - (or (not (file-exists-p file)) - (not (eq (vc-cvs-checkout-model file) - 'implicit))) - "-w") - "update" - ;; default for verbose checkout: clear the sticky tag so - ;; that the actual update will get the head of the trunk - (if (or (not rev) (string= rev "")) - "-A" - (concat "-r" rev)) - switches)))) + (and editable (not (eq (vc-cvs-checkout-model file) 'implicit)) + (if vc-cvs-use-edit + (vc-cvs-command nil 0 file "edit") + (set-file-modes file (logior (file-modes file) 128)) + (if file-buffer (toggle-read-only -1)))) + ;; Check out a particular version (or recreate the file). + (vc-file-setprop file 'vc-workfile-version nil) + (apply 'vc-cvs-command nil 0 file + (and editable + (or (not (file-exists-p file)) + (not (eq (vc-cvs-checkout-model file) + 'implicit))) + "-w") + "update" + ;; default for verbose checkout: clear the sticky tag so + ;; that the actual update will get the head of the trunk + (if (or (not rev) (eq rev t) (string= rev "")) + "-A" + (concat "-r" rev)) + switches)))) (vc-mode-line file) (message "Checking out %s...done" filename)))))