Mercurial > emacs

changeset 33610:32bcc6e27e02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-rcs-state): Call vc-workfile-unchanged-p only here, and differentiate according to checkout model. (vc-rcs-fetch-master-state): Don't call vc-workfile-unchanged-p, since this function is only concerned with master state.
author André Spiegel <spiegel@gnu.org>
date Sun, 19 Nov 2000 09:46:04 +0000
parents 9ac783bec98a
children d00c8e827c5b
files lisp/vc-rcs.el
diffstat 1 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-rcs.el	Sun Nov 19 01:58:06 2000 +0000
+++ b/lisp/vc-rcs.el	Sun Nov 19 09:46:04 2000 +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.11 2000/10/03 12:08:40 spiegel Exp $
+;; $Id: vc-rcs.el,v 1.12 2000/11/16 18:13:16 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -126,7 +126,9 @@
     (if (eq state 'up-to-date)
         (if (vc-workfile-unchanged-p file)
             'up-to-date
-          'unlocked-changes)
+          (if (eq (vc-checkout-model file) 'locking)
+              'unlocked-changes
+            'edited))
       state)))
 
 (defun vc-rcs-state-heuristic (file)
@@ -688,12 +690,7 @@
           (if (or workfile-is-latest
                   (vc-rcs-latest-on-branch-p file workfile-version))
               ;; workfile version is latest on branch
-              (if (eq (vc-checkout-model file) 'locking)
-		  'up-to-date
-		(require 'vc)
-		(if (vc-workfile-unchanged-p file)
-		    'up-to-date
-		  'edited))
+              'up-to-date
             ;; workfile version is not latest on branch
             'needs-patch))
 	 ;; locked by the calling user