Mercurial > emacs
diff lisp/vc-rcs.el @ 94521:2a61c5f918a5
Change 'needs-patch to 'needs-update.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Thu, 01 May 2008 19:13:16 +0000 |
parents | ad6c174910db |
children | a69dcc2c42ae |
line wrap: on
line diff
--- a/lisp/vc-rcs.el Thu May 01 17:46:27 2008 +0000 +++ b/lisp/vc-rcs.el Thu May 01 19:13:16 2008 +0000 @@ -118,23 +118,25 @@ (defun vc-rcs-state (file) "Implementation of `vc-state' for RCS." - (or (boundp 'vc-rcs-headers-result) - (and vc-consult-headers - (vc-rcs-consult-headers file))) - (let ((state - ;; vc-working-revision might not be known; in that case the - ;; property is nil. vc-rcs-fetch-master-state knows how to - ;; handle that. - (vc-rcs-fetch-master-state file - (vc-file-getprop file - 'vc-working-revision)))) - (if (not (eq state 'up-to-date)) - state - (if (vc-workfile-unchanged-p file) - 'up-to-date - (if (eq (vc-rcs-checkout-model file) 'locking) - 'unlocked-changes - 'edited))))) + (if (not (vc-rc-registered f)) + 'unregistered + (or (boundp 'vc-rcs-headers-result) + (and vc-consult-headers + (vc-rcs-consult-headers file))) + (let ((state + ;; vc-working-revision might not be known; in that case the + ;; property is nil. vc-rcs-fetch-master-state knows how to + ;; handle that. + (vc-rcs-fetch-master-state file + (vc-file-getprop file + 'vc-working-revision)))) + (if (not (eq state 'up-to-date)) + state + (if (vc-workfile-unchanged-p file) + 'up-to-date + (if (eq (vc-rcs-checkout-model file) 'locking) + 'unlocked-changes + 'edited)))))) (defun vc-rcs-state-heuristic (file) "State heuristic for RCS." @@ -889,7 +891,7 @@ ;; workfile version is latest on branch 'up-to-date ;; workfile version is not latest on branch - 'needs-patch)) + 'needs-update)) ;; locked by the calling user ((and (stringp locking-user) (string= locking-user (vc-user-login-name file)))