auto upstream

4 files changed, 179 insertions, 64 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b54d34743c..9425ca5cdc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2013-01-06  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp-adb.el (tramp-methods): Add `tramp-tmpdir' entry.
+
+2013-01-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-ls-toolbox-regexp): The file size can
+        consist of mor than one digit.
+        (tramp-adb-file-name-handler-alist): Use
+        `tramp-handle-file-exists-p' consistently.
+        (tramp-adb-file-name-handler): Don't tweak `tramp-default-host'.
+        (tramp-adb-handle-file-exists-p): Remove function.
+        (tramp-adb-file-name-host): New defun.
+        (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
+        Use it.
+        (tramp-adb-maybe-open-connection): Set "remote-path" property.
+
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc.el (vc-next-action): Detect buffer modifications
+        conflicting with locking VCS operation (Bug#11490).
+
+        * vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.
+
+2013-01-05  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
+        (tramp-adb-handle-directory-files-and-attributes): Fix typos.
+
+2013-01-05  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp-adb.el (tramp-adb-handle-file-attributes): More robust
+        parsing of ls output using regular expression (handle filenames
+        with spaces).  Use virtual device number.
+        (tramp-do-parse-file-attributes-with-ls): New defun (Code
+        cleanup).
+
 2013-01-04  Daiki Ueno  <ueno@gnu.org>
 
         * epg.el: Silence byte-compiler warnings.
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index b5f99ffc93c..bb9ff015ac3 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -56,8 +56,18 @@
 (defconst tramp-adb-ls-date-regexp
   "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]")
 
+(defconst tramp-adb-ls-toolbox-regexp
+  (concat
+   "^[[:space:]]*\\([-[:alpha:]]+\\)"   ; \1 permissions
+   "[[:space:]]*\\([^[:space:]]+\\)"    ; \2 username
+   "[[:space:]]+\\([^[:space:]]+\\)"    ; \3 group
+   "[[:space:]]+\\([[:digit:]]+\\)"     ; \4 size
+   "[[:space:]]+\\([-[:digit:]]+[[:space:]][:[:digit:]]+\\)" ; \5 date
+   "[[:space:]]+\\(.*\\)$"))            ; \6 filename
+
 ;;;###tramp-autoload
-(add-to-list 'tramp-methods `(,tramp-adb-method))
+(add-to-list 'tramp-methods `(,tramp-adb-method
+                              (tramp-tmpdir "/data/local/tmp")))
 
 ;;;###tramp-autoload
 (eval-after-load 'tramp
@@ -86,8 +96,8 @@
     (file-directory-p . tramp-adb-handle-file-directory-p)
     (file-symlink-p . tramp-handle-file-symlink-p)
     ;; FIXME: This is too sloppy.
-    (file-executable-p . file-exists-p)
-    (file-exists-p . tramp-adb-handle-file-exists-p)
+    (file-executable-p . tramp-handle-file-exists-p)
+    (file-exists-p . tramp-handle-file-exists-p)
     (file-readable-p . tramp-handle-file-exists-p)
     (file-writable-p . tramp-adb-handle-file-writable-p)
     (file-local-copy . tramp-adb-handle-file-local-copy)
@@ -95,6 +105,9 @@
     (expand-file-name . tramp-adb-handle-expand-file-name)
     (find-backup-file-name . tramp-handle-find-backup-file-name)
     (directory-files . tramp-handle-directory-files)
+    (directory-files-and-attributes
+     . tramp-adb-handle-directory-files-and-attributes)
+    (file-name-all-completions . tramp-sh-handle-file-name-all-completions)
     (make-directory . tramp-adb-handle-make-directory)
     (delete-directory . tramp-adb-handle-delete-directory)
     (delete-file . tramp-adb-handle-delete-file)
@@ -127,13 +140,7 @@
   "Invoke the ADB handler for OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
 pass to the OPERATION."
-  (let ((fn (assoc operation tramp-adb-file-name-handler-alist))
-        ;; `tramp-default-host's default value is (system-name).  Not
-        ;; useful for us.
-        (tramp-default-host
-         (unless (equal (eval (car (get 'tramp-default-host 'standard-value)))
-                        tramp-default-host)
-           tramp-default-host)))
+  (let ((fn (assoc operation tramp-adb-file-name-handler-alist)))
     (if fn
         (save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
@@ -280,30 +287,73 @@ pass to the OPERATION."
                    (tramp-shell-quote-argument localname)) "")
         (with-current-buffer (tramp-get-buffer v)
           (tramp-adb-sh-fix-ls-output)
-          (let* ((columns (split-string (buffer-string)))
-                 (mod-string (nth 0 columns))
-                 (is-dir (eq ?d (aref mod-string 0)))
-                 (is-symlink (eq ?l (aref mod-string 0)))
-                 (symlink-target
-                  (and is-symlink
-                       (cadr (split-string (buffer-string) "\\( -> \\|\n\\)"))))
-                 (uid (nth 1 columns))
-                 (gid (nth 2 columns))
-                 (date (format "%s %s" (nth 4 columns) (nth 5 columns)))
-                 (size (string-to-number (nth 3 columns))))
-            (list
-             (or is-dir symlink-target)
-             1                                  ;link-count
-             ;; no way to handle numeric ids in Androids ash
-             (if (eq id-format 'integer) 0 uid)
-             (if (eq id-format 'integer) 0 gid)
-             '(0 0) ; atime
-             (date-to-time date) ; mtime
-             '(0 0) ; ctime
-             size
-             mod-string
-             ;; fake
-             t 1 1)))))))
+          (cdar (tramp-do-parse-file-attributes-with-ls v id-format)))))))
+
+(defun tramp-do-parse-file-attributes-with-ls (vec &optional id-format)
+  "Parse `file-attributes' for Tramp files using the ls(1) command."
+  (with-current-buffer (tramp-get-buffer vec)
+    (goto-char (point-min))
+    (let ((file-properties nil))
+      (while (re-search-forward tramp-adb-ls-toolbox-regexp nil t)
+        (let* ((mod-string (match-string 1))
+               (is-dir (eq ?d (aref mod-string 0)))
+               (is-symlink (eq ?l (aref mod-string 0)))
+               (uid (match-string 2))
+               (gid (match-string 3))
+               (size (string-to-number (match-string 4)))
+               (date (match-string 5))
+               (name (match-string 6))
+               (symlink-target
+                (and is-symlink
+                     (cadr (split-string name "\\( -> \\|\n\\)")))))
+          (push (list
+                 name
+                 (or is-dir symlink-target)
+                 1     ;link-count
+                 ;; no way to handle numeric ids in Androids ash
+                 (if (eq id-format 'integer) 0 uid)
+                 (if (eq id-format 'integer) 0 gid)
+                 '(0 0)                 ; atime
+                 (date-to-time date)    ; mtime
+                 '(0 0)                 ; ctime
+                 size
+                 mod-string
+                 ;; fake
+                 t 1
+                 (tramp-get-device vec))
+                file-properties)))
+      file-properties)))
+
+(defun tramp-adb-handle-directory-files-and-attributes
+  (directory &optional full match nosort id-format)
+  "Like `directory-files-and-attributes' for Tramp files."
+  (when (file-directory-p directory)
+    (with-parsed-tramp-file-name (expand-file-name directory) nil
+      (with-tramp-file-property
+          v localname (format "directory-files-attributes-%s-%s-%s-%s"
+                              full match id-format nosort)
+        (tramp-adb-barf-unless-okay
+         v (format "%s -a -l %s"
+                   (tramp-adb-get-ls-command v)
+                   (tramp-shell-quote-argument localname)) "")
+        (with-current-buffer (tramp-get-buffer v)
+          (tramp-adb-sh-fix-ls-output)
+          (let ((result (tramp-do-parse-file-attributes-with-ls
+                         v (or id-format 'integer))))
+            (when full
+              (setq result
+                    (mapcar
+                     (lambda (x)
+                       (cons (expand-file-name (car x) directory) (cdr x)))
+                     result)))
+            (unless nosort
+              (setq result
+                    (sort result (lambda (x y) (string< (car x) (car y))))))
+            (delq nil
+                  (mapcar (lambda (x)
+                            (if (or (not match) (string-match match (car x)))
+                                x))
+                          result))))))))
 
 (defun tramp-adb-get-ls-command (vec)
   (with-tramp-connection-property vec "ls"
@@ -885,20 +935,19 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
         (tramp-set-connection-property v "process-name" nil)
         (tramp-set-connection-property v "process-buffer" nil)))))
 
-;; Android < 4 doesn't provide test command.
-
-(defun tramp-adb-handle-file-exists-p (filename)
-  "Like `file-exists-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-tramp-file-property v localname "file-exists-p"
-      (file-attributes filename))))
-
 ;; Helper functions.
 
+(defun tramp-adb-file-name-host (vec)
+  "Return host component of VEC.
+If it is equal to the default value of `tramp-default-host', `nil' is returned."
+  (let ((host (tramp-file-name-host vec)))
+    (unless (equal host (eval (car (get 'tramp-default-host 'standard-value))))
+      host)))
+
 (defun tramp-adb-execute-adb-command (vec &rest args)
   "Returns nil on success error-output on failure."
-  (when (tramp-file-name-host vec)
-    (setq args (append (list "-s" (tramp-file-name-host vec)) args)))
+  (when (tramp-adb-file-name-host vec)
+    (setq args (append (list "-s" (tramp-adb-file-name-host vec)) args)))
   (with-temp-buffer
     (prog1
         (unless (zerop (apply 'call-process (tramp-adb-program) nil t nil args))
@@ -1006,21 +1055,21 @@ connection if a previous connection has died for some reason."
         (when (and p (processp p)) (delete-process p))
         (if (not devices)
             (tramp-error vec 'file-error "No device connected"))
-        (if (and (tramp-file-name-host vec)
-                 (not (member (tramp-file-name-host vec) devices)))
+        (if (and (tramp-adb-file-name-host vec)
+                 (not (member (tramp-adb-file-name-host vec) devices)))
             (tramp-error
              vec 'file-error
-             "Device %s not connected" (tramp-file-name-host vec)))
+             "Device %s not connected" (tramp-adb-file-name-host vec)))
         (if (and (not (eq (length devices) 1))
-                 (not (tramp-file-name-host vec)))
+                 (not (tramp-adb-file-name-host vec)))
             (tramp-error
              vec 'file-error
              "Multiple Devices connected: No Host/Device specified"))
         (with-tramp-progress-reporter vec 3 "Opening adb shell connection"
           (let* ((coding-system-for-read 'utf-8-dos) ;is this correct?
                  (process-connection-type tramp-process-connection-type)
-                 (args (if (tramp-file-name-host vec)
-                           (list "-s" (tramp-file-name-host vec) "shell")
+                 (args (if (tramp-adb-file-name-host vec)
+                           (list "-s" (tramp-adb-file-name-host vec) "shell")
                          (list "shell")))
                  (p (let ((default-directory
                             (tramp-compat-temporary-file-directory)))
@@ -1056,7 +1105,19 @@ connection if a previous connection has died for some reason."
                  vec 3
                  "Connection reset, because remote host changed from `%s' to `%s'"
                  old-getprop new-getprop)
-                (tramp-adb-maybe-open-connection vec)))))))))
+                (tramp-adb-maybe-open-connection vec)))
+
+            ;; Set "remote-path" connection property.  This is needed
+            ;; for eshell.
+            (tramp-adb-send-command vec "echo \\\"$PATH\\\"")
+            (tramp-set-connection-property
+             vec "remote-path"
+             (split-string
+              (with-current-buffer (tramp-get-connection-buffer vec)
+                ;; Read the expression.
+                (goto-char (point-min))
+                (read (current-buffer)))
+              ":" 'omit-nulls))))))))
 
 (provide 'tramp-adb)
 ;;; tramp-adb.el ends here
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 5a2b47bb34f..99436303fa2 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -703,19 +703,21 @@ Before doing that, check if there are any old backups and get rid of them."
   ;; the state to 'edited and redisplay the mode line.
   (let* ((file buffer-file-name)
          (backend (vc-backend file)))
-    (and backend
-         (or (and (equal (vc-file-getprop file 'vc-checkout-time)
-                         (nth 5 (file-attributes file)))
-                  ;; File has been saved in the same second in which
-                  ;; it was checked out.  Clear the checkout-time
-                  ;; to avoid confusion.
-                  (vc-file-setprop file 'vc-checkout-time nil))
-             t)
-         (eq (vc-checkout-model backend (list file)) 'implicit)
-         (vc-state-refresh file backend)
-         (vc-mode-line file backend))
-    ;; Try to avoid unnecessary work, a *vc-dir* buffer is
-    ;; present if this is true.
+    (cond
+     ((null backend))
+     ((eq (vc-checkout-model backend (list file)) 'implicit)
+      ;; If the file was saved in the same second in which it was
+      ;; checked out, clear the checkout-time to avoid confusion.
+      (if (equal (vc-file-getprop file 'vc-checkout-time)
+                 (nth 5 (file-attributes file)))
+          (vc-file-setprop file 'vc-checkout-time nil))
+      (if (vc-state-refresh file backend)
+          (vc-mode-line file backend)))
+     ;; If we saved an unlocked file on a locking based VCS, that
+     ;; file is not longer up-to-date.
+     ((eq (vc-file-getprop file 'vc-state) 'up-to-date)
+      (vc-file-setprop file 'vc-state nil)))
+    ;; Resynch *vc-dir* buffers, if any are present.
     (when vc-dir-buffers
       (vc-dir-resynch-file file))))
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index fe259806267..9b8b94916c4 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -659,6 +659,10 @@
 (eval-when-compile
   (require 'dired))
 
+(declare-function dired-get-filename "dired" (&optional localp noerror))
+(declare-function dired-move-to-filename "dired" (&optional err eol))
+(declare-function dired-marker-regexp "dired" ())
+
 (unless (assoc 'vc-parent-buffer minor-mode-alist)
   (setq minor-mode-alist
         (cons '(vc-parent-buffer vc-parent-buffer-name)
@@ -1072,6 +1076,17 @@ For old-style locking-based version control systems, like RCS:
          ;; among all the `files'.
          (model (nth 4 vc-fileset)))
 
+    ;; If a buffer has unsaved changes, a checkout would discard those
+    ;; changes, so treat the buffer as having unlocked changes.
+    (when (and (not (eq model 'implicit)) (eq state 'up-to-date))
+      (let ((files files))
+        (while files
+          (let ((buffer (get-file-buffer (car files))))
+            (and buffer
+                 (buffer-modified-p buffer)
+                 (setq state 'unlocked-changes
+                       files nil))))))
+
     ;; Do the right thing
     (cond
      ((eq state 'missing)