Mercurial > emacs
changeset 39001:d13c2139752b
(vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Tue, 28 Aug 2001 17:06:36 +0000 |
| parents | 60cf6aee9fd1 |
| children | e008ccec0cad |
| files | lisp/vc-cvs.el lisp/vc-rcs.el lisp/vc-sccs.el |
| diffstat | 3 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Tue Aug 28 17:02:59 2001 +0000 +++ b/lisp/vc-cvs.el Tue Aug 28 17:06:36 2001 +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.22 2001/04/17 05:59:57 eliz Exp $ +;; $Id: vc-cvs.el,v 1.23 2001/07/04 15:51:18 monnier Exp $ ;; This file is part of GNU Emacs. @@ -378,16 +378,17 @@ (vc-mode-line file) (message "Checking out %s...done" filename))))) -(defun vc-cvs-revert (file) +(defun vc-cvs-revert (file &optional contents-done) "Revert FILE to the version it was based on." - ;; Check out via standard output (caused by the final argument - ;; FILE below), so that no sticky tag is set. - (vc-cvs-checkout file nil (vc-workfile-version file) file) - ;; If "cvs edit" was used to make the file writable, - ;; call "cvs unedit" now to undo that. - (if (and (not (eq (vc-cvs-checkout-model file) 'implicit)) - vc-cvs-use-edit) - (vc-do-command nil 0 "cvs" file "unedit"))) + (unless contents-done + ;; Check out via standard output (caused by the final argument + ;; FILE below), so that no sticky tag is set. + (vc-cvs-checkout file nil (vc-workfile-version file) file)) + (unless (eq (vc-checkout-model file) 'implicit) + (if vc-cvs-use-edit + (vc-do-command nil 0 "cvs" file "unedit") + ;; Make the file read-only by switching off all w-bits + (set-file-modes file (logand (file-modes file) 3950))))) (defun vc-cvs-merge (file first-version &optional second-version) "Merge changes into current working copy of FILE.
--- a/lisp/vc-rcs.el Tue Aug 28 17:02:59 2001 +0000 +++ b/lisp/vc-rcs.el Tue Aug 28 17:06:36 2001 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-rcs.el,v 1.19 2001/03/10 10:50:16 spiegel Exp $ +;; $Id: vc-rcs.el,v 1.20 2001/07/16 12:22:59 pj Exp $ ;; This file is part of GNU Emacs. @@ -455,7 +455,7 @@ new-version)))))) (message "Checking out %s...done" filename))))) -(defun vc-rcs-revert (file) +(defun vc-rcs-revert (file &optional contents-done) "Revert FILE to the version it was based on." (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-u" (vc-workfile-version file))))
--- a/lisp/vc-sccs.el Tue Aug 28 17:02:59 2001 +0000 +++ b/lisp/vc-sccs.el Tue Aug 28 17:06:36 2001 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-sccs.el,v 1.11 2001/03/29 11:49:22 spiegel Exp $ +;; $Id: vc-sccs.el,v 1.12 2001/07/16 12:22:59 pj Exp $ ;; This file is part of GNU Emacs. @@ -261,7 +261,7 @@ switches))))) (message "Checking out %s...done" filename))) -(defun vc-sccs-revert (file) +(defun vc-sccs-revert (file &optional contents-done) "Revert FILE to the version it was based on." (vc-do-command nil 0 "unget" (vc-name file)) (vc-do-command nil 0 "get" (vc-name file))