[Emacs-diffs] emacs/lisp ChangeLog vc-svn.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/01/31 15:51:09

Modified files:
        lisp           : ChangeLog vc-svn.el 

Log message:
        (vc-svn-dir-status): Disable the vc-stay-local-p
        logic, it makes the makes the normal case too slow.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15228&r2=1.15229
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.109&r2=1.110

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15228
retrieving revision 1.15229
diff -u -b -r1.15228 -r1.15229
--- ChangeLog   31 Jan 2009 14:34:05 -0000      1.15228
+++ ChangeLog   31 Jan 2009 15:51:07 -0000      1.15229
@@ -1,3 +1,8 @@
+2009-01-31  Dan Nicolaescu  <address@hidden>
+
+       * vc-svn.el (vc-svn-dir-status): Disable the vc-stay-local-p
+       logic, it makes the makes the normal case too slow.
+
 2009-01-31  Eli Zaretskii  <address@hidden>
 
        * mail/unrmail.el (unrmail): Set coding-system of the old Rmail

Index: vc-svn.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- vc-svn.el   30 Jan 2009 08:16:26 -0000      1.109
+++ vc-svn.el   31 Jan 2009 15:51:09 -0000      1.110
@@ -185,8 +185,12 @@
 CALLBACK is called as (CALLBACK RESULT BUFFER), where
 RESULT is a list of conses (FILE . STATE) for directory DIR."
   ;; FIXME should this rather be all the files in dir?
-  (let* ((local (vc-stay-local-p dir))
-        (remote (or (not local) (eq local 'only-file))))
+  ;; FIXME: the vc-stay-local-p logic below is disabled, it ends up
+  ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR
+  ;; which is VERY SLOW for big trees and it makes emacs
+  ;; completely unresponsive during that time.
+  (let* ((local (and nil (vc-stay-local-p dir)))
+        (remote (or t (not local) (eq local 'only-file))))
     (vc-svn-command (current-buffer) 'async nil "status"
                    (if remote "-u"))
   (vc-exec-after