From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 9 May 2007 17:09:08 +0000 (+0000)
Subject: (vc-find-root): Stop searching when the user changes.
X-Git-Tag: emacs-pretest-23.0.90~12706
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c70938839402399fd73c389e065d8047f7c43f30;p=emacs.git

(vc-find-root): Stop searching when the user changes.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f519f688e1..298684782ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* vc-hooks.el (vc-find-root): Stop searching when the user changes.
+
 2007-05-09  Edward O'Connor  <hober0@gmail.com>  (tiny change)
 
 	* progmodes/python.el (python-font-lock-keywords)
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index d67a0262d88..1bde704790b 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -315,10 +315,17 @@ If WITNESS if not found, return nil, otherwise return the root."
   ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
   ;; witnesses in /home or in /.
   (setq file (abbreviate-file-name file))
-  (let ((root nil))
+  (let ((root nil)
+        (user (nth 2 (file-attributes file))))
     (while (not (or root
                    (equal file (setq file (file-name-directory file)))
                    (null file)
+                   ;; As a heuristic, we stop looking up the hierarchy of
+                   ;; directories as soon as we find a directory belonging
+                   ;; to another user.  This should save us from looking in
+                   ;; things like /net and /afs.  This assumes that all the
+                   ;; files inside a project belong to the same user.
+                   (not (equal user (file-attributes file)))
                    (string-match vc-ignore-dir-regexp file)))
       (if (file-exists-p (expand-file-name witness file))
          (setq root file)