[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110915: * net/tramp-sh.el (tramp-do-copy-or-rename-file): If both files

[Michael Albinus]

------------------------------------------------------------
revno: 110915
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-19 16:25:10 +0100
message:
  * net/tramp-sh.el (tramp-do-copy-or-rename-file): If both files
  are remote, check out-of-band property for both.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-19 03:16:03 +0000
+++ b/lisp/ChangeLog    2012-11-19 15:25:10 +0000
@@ -1,3 +1,8 @@
+2012-11-19  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file): If both files
+       are remote, check out-of-band property for both.
+
 2012-11-19  Stefan Monnier  <address@hidden>
 
        * window.el (switch-to-buffer): Re-add the warning that was lost in the

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-11-18 17:10:35 +0000
+++ b/lisp/net/tramp-sh.el      2012-11-19 15:25:10 +0000
@@ -1270,9 +1270,10 @@
          res-uid
          ;; 3. File gid.
          res-gid
-         ;; 4. Last access time, as a list of integers.  Normally this would be
-         ;; in the same format as `current-time', but the subseconds part is 
not
-         ;; currently implemented, and (0 0) denotes an unknown time.
+         ;; 4. Last access time, as a list of integers.  Normally this
+         ;; would be in the same format as `current-time', but the
+         ;; subseconds part is not currently implemented, and (0 0)
+         ;; denotes an unknown time.
          ;; 5. Last modification time, likewise.
          ;; 6. Last status change time, likewise.
          '(0 0) '(0 0) '(0 0)          ;CCC how to find out?
@@ -1980,6 +1981,7 @@
     (error "Unknown operation `%s', must be `copy' or `rename'" op))
   (let ((t1 (tramp-tramp-file-p filename))
        (t2 (tramp-tramp-file-p newname))
+       (length (nth 7 (file-attributes (file-truename filename))))
        (context (and preserve-selinux-context
                      (apply 'file-selinux-context (list filename))))
        pr tm)
@@ -2009,8 +2011,9 @@
                 ok-if-already-exists keep-date preserve-uid-gid))
 
               ;; Try out-of-band operation.
-              ((tramp-method-out-of-band-p
-                v1 (nth 7 (file-attributes (file-truename filename))))
+              ((and
+                (tramp-method-out-of-band-p v1 length)
+                (tramp-method-out-of-band-p v2 length))
                (tramp-do-copy-or-rename-file-out-of-band
                 op filename newname keep-date))
 
@@ -2038,8 +2041,7 @@
 
           ;; If the Tramp file has an out-of-band method, the
           ;; corresponding copy-program can be invoked.
-          ((tramp-method-out-of-band-p
-            v (nth 7 (file-attributes (file-truename filename))))
+          ((tramp-method-out-of-band-p v length)
            (tramp-do-copy-or-rename-file-out-of-band
             op filename newname keep-date))