(x_new_font): Update f->scroll_bar_actual_width.

[bpt/emacs.git] / lisp / net / tramp-cache.el

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 2a1d840..77aad29 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -1,6 +1,7 @@
 ;;; tramp-cache.el --- file information caching for Tramp
 
-;; Copyright (C) 2000, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2005, 2006, 2007, 2008,
+;;   2009 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <daniel@inanna.danann.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
@@ -60,6 +61,8 @@
   (autoload 'tramp-file-name-user "tramp")
   (autoload 'tramp-file-name-host "tramp")
   (autoload 'tramp-file-name-localname "tramp")
+  (autoload 'tramp-run-real-handler "tramp")
+  (autoload 'tramp-time-less-p "tramp")
   (autoload 'time-stamp-string "time-stamp"))
 
 ;;; -- Cache --
@@ -67,6 +70,13 @@
 (defvar tramp-cache-data (make-hash-table :test 'equal)
   "Hash table for remote files properties.")
 
+(defvar tramp-cache-inhibit-cache nil
+  "Inhibit cache read access, when `t'.
+`nil' means to accept cache entries unconditionally.  If the
+value is a timestamp (as returned by `current-time'), cache
+entries are not used when they have been written before this
+time.")
+
 (defcustom tramp-persistency-file-name
   (cond
    ;; GNU Emacs.
@@ -89,6 +99,9 @@
   :group 'tramp
   :type 'file)
 
+(defvar tramp-cache-data-changed nil
+  "Whether persistent cache data have been changed.")
+
 (defun tramp-get-file-property (vec file property default)
   "Get the PROPERTY of FILE from the cache context of VEC.
 Returns DEFAULT if not set."
@@ -98,9 +111,21 @@ Returns DEFAULT if not set."
   (let* ((hash (or (gethash vec tramp-cache-data)
                   (puthash vec (make-hash-table :test 'equal)
                            tramp-cache-data)))
-        (value (if (hash-table-p hash)
-                   (gethash property hash default)
-                 default)))
+        (value (when (hash-table-p hash) (gethash property hash))))
+    (if
+       ;; We take the value only if there is any, and
+       ;; `tramp-cache-inhibit-cache' indicates that it is still
+       ;; valid.  Otherwise, DEFAULT is set.
+       (and (consp value)
+            (or (null tramp-cache-inhibit-cache)
+                (and (consp tramp-cache-inhibit-cache)
+                     (tramp-time-less-p
+                      tramp-cache-inhibit-cache (car value)))))
+       (setq value (cdr value))
+      (setq value default))
+
+    (if (consp tramp-cache-inhibit-cache)
+       (tramp-message vec 1 "%s %s %s" file property value))
     (tramp-message vec 8 "%s %s %s" file property value)
     value))
 
@@ -113,7 +138,8 @@ Returns VALUE."
   (let ((hash (or (gethash vec tramp-cache-data)
                  (puthash vec (make-hash-table :test 'equal)
                           tramp-cache-data))))
-    (puthash property value hash)
+    ;; We put the timestamp there.
+    (puthash property (cons (current-time) value) hash)
     (tramp-message vec 8 "%s %s %s" file property value)
     value))
 
@@ -133,7 +159,7 @@ Remove also properties of all files in subdirectories."
   (tramp-message vec 8 "%s" directory)
     (maphash
      '(lambda (key value)
-       (when (and (stringp key)
+       (when (and (stringp (tramp-file-name-localname key))
                   (string-match directory (tramp-file-name-localname key)))
          (remhash key tramp-cache-data)))
      tramp-cache-data)))
@@ -143,7 +169,7 @@ Remove also properties of all files in subdirectories."
 ;; not show proper directory contents when a file has been copied or
 ;; deleted before.
 (defun tramp-flush-file-function ()
-  "Flush all Tramp cache properties from buffer-file-name."
+  "Flush all Tramp cache properties from `buffer-file-name'."
   (let ((bfn (if (stringp (buffer-file-name))
                 (buffer-file-name)
               default-directory)))
@@ -177,8 +203,8 @@ If the value is not set for the connection, returns DEFAULT."
     (aset key 3 nil))
   (let* ((hash (gethash key tramp-cache-data))
         (value (if (hash-table-p hash)
-                  (gethash property hash default)
-                default)))
+                   (gethash property hash default)
+                 default)))
     (tramp-message key 7 "%s %s" property value)
     value))
 
@@ -195,6 +221,7 @@ PROPERTY is set persistent when KEY is a vector."
                  (puthash key (make-hash-table :test 'equal)
                            tramp-cache-data))))
     (puthash property value hash)
+    (setq tramp-cache-data-changed t)
     ;; This function is called also during initialization of
     ;; tramp-cache.el.  `tramp-message´ is not defined yet at this
     ;; time, so we ignore the corresponding error.
@@ -211,6 +238,16 @@ KEY identifies the connection, it is either a process or a vector."
   (when (vectorp key)
     (setq key (copy-sequence key))
     (aset key 3 nil))
+  (tramp-message
+   key 7 "%s %s" key
+   (let ((hash (gethash key tramp-cache-data))
+        properties)
+     (if (hash-table-p hash)
+        (maphash
+         (lambda (x y) (add-to-list 'properties x 'append))
+         (gethash key tramp-cache-data)))
+     properties))
+  (setq tramp-cache-data-changed t)
   (remhash key tramp-cache-data))
 
 (defun tramp-cache-print (table)
@@ -249,6 +286,7 @@ KEY identifies the connection, it is either a process or a vector."
   (condition-case nil
       (when (and (hash-table-p tramp-cache-data)
                 (not (zerop (hash-table-count tramp-cache-data)))
+                tramp-cache-data-changed
                 (stringp tramp-persistency-file-name))
        (let ((cache (copy-hash-table tramp-cache-data)))
          ;; Remove temporary data.
@@ -289,8 +327,7 @@ KEY identifies the connection, it is either a process or a vector."
 (defun tramp-parse-connection-properties (method)
   "Return a list of (user host) tuples allowed to access for METHOD.
 This function is added always in `tramp-get-completion-function'
-for all methods.  Resulting data are derived from connection
-history."
+for all methods.  Resulting data are derived from connection history."
   (let (res)
     (maphash
      '(lambda (key value)
@@ -314,7 +351,8 @@ history."
          (while (setq element (pop list))
            (setq key (pop element))
            (while (setq item (pop element))
-             (tramp-set-connection-property key (pop item) (car item))))))
+             (tramp-set-connection-property key (pop item) (car item)))))
+       (setq tramp-cache-data-changed nil))
     (file-error
      ;; Most likely because the file doesn't exist yet.  No message.
      (clrhash tramp-cache-data))