[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-rcs.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-rcs.el |
Date: |
Fri, 04 Apr 2003 01:23:16 -0500 |
Index: emacs/lisp/vc-rcs.el
diff -c emacs/lisp/vc-rcs.el:1.35 emacs/lisp/vc-rcs.el:1.36
*** emacs/lisp/vc-rcs.el:1.35 Tue Jan 7 03:28:15 2003
--- emacs/lisp/vc-rcs.el Tue Feb 4 07:11:40 2003
***************
*** 5,11 ****
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-rcs.el,v 1.35 2003/01/07 08:28:15 spiegel Exp $
;; This file is part of GNU Emacs.
--- 5,11 ----
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-rcs.el,v 1.36 2003/02/04 12:11:40 lektu Exp $
;; This file is part of GNU Emacs.
***************
*** 143,151 ****
(cond
((string-match ".rw..-..-." (nth 8 (file-attributes file)))
(vc-file-setprop file 'vc-checkout-model 'implicit)
! (setq state
! (if (vc-rcs-workfile-is-newer file)
! 'edited
'up-to-date)))
((string-match ".r-..-..-." (nth 8 (file-attributes file)))
(vc-file-setprop file 'vc-checkout-model 'locking))))
--- 143,151 ----
(cond
((string-match ".rw..-..-." (nth 8 (file-attributes file)))
(vc-file-setprop file 'vc-checkout-model 'implicit)
! (setq state
! (if (vc-rcs-workfile-is-newer file)
! 'edited
'up-to-date)))
((string-match ".r-..-..-." (nth 8 (file-attributes file)))
(vc-file-setprop file 'vc-checkout-model 'locking))))
***************
*** 162,168 ****
(if (file-ownership-preserved-p file)
'edited
(vc-user-login-name owner-uid))
! (if (vc-rcs-workfile-is-newer file)
'edited
'up-to-date)))
(t
--- 162,168 ----
(if (file-ownership-preserved-p file)
'edited
(vc-user-login-name owner-uid))
! (if (vc-rcs-workfile-is-newer file)
'edited
'up-to-date)))
(t
***************
*** 243,249 ****
(if (stringp vc-rcs-register-switches)
(list vc-rcs-register-switches)
vc-rcs-register-switches))))
!
(and (not (file-exists-p subdir))
(not (directory-files (file-name-directory file)
nil ".*,v$" t))
--- 243,249 ----
(if (stringp vc-rcs-register-switches)
(list vc-rcs-register-switches)
vc-rcs-register-switches))))
!
(and (not (file-exists-p subdir))
(not (directory-files (file-name-directory file)
nil ".*,v$" t))
***************
*** 305,311 ****
(and (string= (file-name-nondirectory (directory-file-name dir)) "RCS")
;; check whether RCS dir is empty, i.e. it does not
;; contain any files except "." and ".."
! (not (directory-files dir nil
"^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*"))
(yes-or-no-p (format "Directory %s is empty; remove it? " dir))
(delete-directory dir))))
--- 305,311 ----
(and (string= (file-name-nondirectory (directory-file-name dir)) "RCS")
;; check whether RCS dir is empty, i.e. it does not
;; contain any files except "." and ".."
! (not (directory-files dir nil
"^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*"))
(yes-or-no-p (format "Directory %s is empty; remove it? " dir))
(delete-directory dir))))
***************
*** 317,323 ****
vc-checkin-switches)))
(let ((old-version (vc-workfile-version file)) new-version
(default-branch (vc-file-getprop file 'vc-rcs-default-branch)))
! ;; Force branch creation if an appropriate
;; default branch has been set.
(and (not rev)
default-branch
--- 317,323 ----
vc-checkin-switches)))
(let ((old-version (vc-workfile-version file)) new-version
(default-branch (vc-file-getprop file 'vc-rcs-default-branch)))
! ;; Force branch creation if an appropriate
;; default branch has been set.
(and (not rev)
default-branch
***************
*** 351,357 ****
((and old-version new-version
(not (string= (vc-branch-part old-version)
(vc-branch-part new-version))))
! (vc-rcs-set-default-branch file
(if (vc-trunk-p new-version) nil
(vc-branch-part new-version)))
;; If this is an old RCS release, we might have
--- 351,357 ----
((and old-version new-version
(not (string= (vc-branch-part old-version)
(vc-branch-part new-version))))
! (vc-rcs-set-default-branch file
(if (vc-trunk-p new-version) nil
(vc-branch-part new-version)))
;; If this is an old RCS release, we might have
***************
*** 407,413 ****
(concat "-r" rev)
(let ((workrev (vc-workfile-version file)))
(if workrev
! (concat "-r"
(if (not rev)
;; no revision specified:
;; use current workfile version
--- 407,413 ----
(concat "-r" rev)
(let ((workrev (vc-workfile-version file)))
(if workrev
! (concat "-r"
(if (not rev)
;; no revision specified:
;; use current workfile version
***************
*** 428,434 ****
(vc-file-setprop file 'vc-workfile-version new-version)
;; if necessary, adjust the default branch
(and rev (not (string= rev ""))
! (vc-rcs-set-default-branch
file
(if (vc-rcs-latest-on-branch-p file new-version)
(if (vc-trunk-p new-version) nil
--- 428,434 ----
(vc-file-setprop file 'vc-workfile-version new-version)
;; if necessary, adjust the default branch
(and rev (not (string= rev ""))
! (vc-rcs-set-default-branch
file
(if (vc-rcs-latest-on-branch-p file new-version)
(if (vc-trunk-p new-version) nil
***************
*** 439,445 ****
(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 (if (eq (vc-state file) 'edited) "-u" "-r")
(vc-workfile-version file))))
(defun vc-rcs-cancel-version (file editable)
--- 439,445 ----
(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 (if (eq (vc-state file) 'edited) "-u" "-r")
(vc-workfile-version file))))
(defun vc-rcs-cancel-version (file editable)
***************
*** 483,489 ****
"Steal the lock on the current workfile for FILE and revision REV.
Needs RCS 5.6.2 or later for -M."
(vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev))
! ;; Do a real checkout after stealing the lock, so that we see
;; expanded headers.
(vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev)))
--- 483,489 ----
"Steal the lock on the current workfile for FILE and revision REV.
Needs RCS 5.6.2 or later for -M."
(vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev))
! ;; Do a real checkout after stealing the lock, so that we see
;; expanded headers.
(vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc-rcs.el,
Miles Bader <=