diff options
author | André Spiegel <[email protected]> | 2000-11-20 14:01:35 +0000 |
---|---|---|
committer | André Spiegel <[email protected]> | 2000-11-20 14:01:35 +0000 |
commit | 2ce63cb7f58e540c18be064c9185f6ca6d5f7890 (patch) | |
tree | f808a9d34198fdc61da8a0968092cfbc5edd335d | |
parent | d18385569d583fcaba14be3f422e3d034ea2ed9f (diff) |
Undo prev change.
-rw-r--r-- | lisp/vc-hooks.el | 16 | ||||
-rw-r--r-- | lisp/vc.el | 14 |
2 files changed, 16 insertions, 14 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 53108653f0..9f7bab9c1d 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -365,26 +365,14 @@ It simply calls the real state computation function `vc-BACKEND-state' 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 --git a/lisp/vc.el b/lisp/vc.el index a82d579de6..f77ebb1dc1 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -825,6 +825,20 @@ NOT-URGENT means it is ok to continue if the user says not to save." (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 |