* lisp/vc/vc-svn.el (vc-svn-state-heuristic): Avoid calling svn.

Fixes: debbugs:7850

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce4919afa2b76383aaa53fb63e605f141a71fa98..09f3a586b4f365de1580b3ffa70dc2a683459b7a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-04  Glenn Morris  <rgm@gnu.org>
+
+       * vc/vc-svn.el (vc-svn-state-heuristic): Avoid calling svn.  (Bug#7850)
+
 2012-11-04  Chong Yidong  <cyd@gnu.org>
 
        * bookmark.el (bookmark-bmenu-switch-other-window): Avoid binding

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 6c2367c7ba6853ef5833e8bb0baa71be10a454dd..3becd8950f189eafb9e8d7981c4b0fb6a8522617 100644 (file)
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -155,9 +155,24 @@ If you want to force an empty list of arguments, use t."
       (vc-svn-command t 0 file "status" (if localp "-v" "-u"))
       (vc-svn-parse-status file))))
 
+;; NB this does not handle svn properties, which can be changed
+;; without changing the file timestamp.
+;; Note that unlike vc-cvs-state-heuristic, this is not called from
+;; vc-svn-state.  AFAICS, it is only called from vc-state-refresh via
+;; vc-after-save (bug#7850).  Therefore the fact that it ignores
+;; properties is irrelevant.  If you want to make vc-svn-state call
+;; this, it should be extended to handle svn properties.
 (defun vc-svn-state-heuristic (file)
   "SVN-specific state heuristic."
-  (vc-svn-state file 'local))
+  ;; If the file has not changed since checkout, consider it `up-to-date'.
+  ;; Otherwise consider it `edited'.  Copied from vc-cvs-state-heuristic.
+  (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
+        (lastmod (nth 5 (file-attributes file))))
+    (cond
+     ((equal checkout-time lastmod) 'up-to-date)
+     ((string= (vc-working-revision file) "0") 'added)
+     ((null checkout-time) 'unregistered)
+     (t 'edited))))
 
 ;; FIXME it would be better not to have the "remote" argument,
 ;; but to distinguish the two output formats based on content.