# HG changeset patch # User Andr Spiegel # Date 974728895 0 # Node ID c97a649b19874eea37d39c808fa61b7d3611943b # Parent b87e054215797853655065c15a3a8dd0ae6ba829 Undo prev change. diff -r b87e05421579 -r c97a649b1987 lisp/vc-hooks.el --- a/lisp/vc-hooks.el Mon Nov 20 13:58:45 2000 +0000 +++ b/lisp/vc-hooks.el Mon Nov 20 14:01:35 2000 +0000 @@ -365,26 +365,14 @@ and does not employ any heuristic at all." (vc-call-backend backend 'state file)) -(defun vc-workfile-unchanged-p (file) - "Has FILE changed since last checkout?" - (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) - (lastmod (nth 5 (file-attributes file)))) - (if checkout-time - (equal checkout-time lastmod) - (let ((unchanged (vc-call workfile-unchanged-p file))) - (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) - unchanged)))) - -(defun vc-default-workfile-unchanged-p (file) - "Default check whether FILE is unchanged: diff against master version." - (zerop (vc-call diff file (vc-workfile-version file)))) - (defun vc-workfile-version (file) "Return version level of the current workfile FILE." (or (vc-file-getprop file 'vc-workfile-version) (vc-file-setprop file 'vc-workfile-version (vc-call workfile-version file)))) +;;; actual version-control code starts here + (defun vc-default-registered (backend file) "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates." (let ((sym (vc-make-backend-sym backend 'master-templates))) diff -r b87e05421579 -r c97a649b1987 lisp/vc.el --- a/lisp/vc.el Mon Nov 20 13:58:45 2000 +0000 +++ b/lisp/vc.el Mon Nov 20 14:01:35 2000 +0000 @@ -825,6 +825,20 @@ (unless not-urgent (error "Aborted"))))) +(defun vc-workfile-unchanged-p (file) + "Has FILE changed since last checkout?" + (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) + (lastmod (nth 5 (file-attributes file)))) + (if checkout-time + (equal checkout-time lastmod) + (let ((unchanged (vc-call workfile-unchanged-p file))) + (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) + unchanged)))) + +(defun vc-default-workfile-unchanged-p (file) + "Default check whether FILE is unchanged: diff against master version." + (zerop (vc-call diff file (vc-workfile-version file)))) + (defun vc-recompute-state (file) "Force a recomputation of the version control state of FILE. The state is computed using the exact, and possibly expensive