[Emacs-diffs] trunk r116780: * net/tramp.el (tramp-action-out-of-band): Read pending output.

[Michael Albinus]

------------------------------------------------------------
revno: 116780
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2014-03-17 10:28:47 +0100
message:
  * net/tramp.el (tramp-action-out-of-band): Read pending output.
  (tramp-call-process): Trace also DESTINATION.
  
  * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
  Quote file names when they are local.  Remove superfluous trace.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-17 06:48:09 +0000
+++ b/lisp/ChangeLog    2014-03-17 09:28:47 +0000
@@ -1,3 +1,11 @@
+2014-03-17  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-action-out-of-band): Read pending output.
+       (tramp-call-process): Trace also DESTINATION.
+
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+       Quote file names when they are local.  Remove superfluous trace.
+
 2014-03-17  Dmitry Gutov  <address@hidden>
 
        * newcomment.el (comment-beginning): If `comment-start-skip'

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-03-10 13:36:39 +0000
+++ b/lisp/net/tramp-sh.el      2014-03-17 09:28:47 +0000
@@ -2246,7 +2246,9 @@
        (aset v 3 localname)
 
        ;; Check which ones of source and target are Tramp files.
-       (setq source (if t1 (tramp-make-copy-program-file-name v) filename)
+       (setq source (if t1
+                        (tramp-make-copy-program-file-name v)
+                      (shell-quote-argument filename))
              target (funcall
                      (if (and (file-directory-p filename)
                               (string-equal
@@ -2254,7 +2256,9 @@
                                (file-name-nondirectory newname)))
                          'file-name-directory
                        'identity)
-                     (if t2 (tramp-make-copy-program-file-name v) newname)))
+                     (if t2
+                         (tramp-make-copy-program-file-name v)
+                       (shell-quote-argument newname))))
 
        ;; Check for host and port number.  We cannot use
        ;; `tramp-file-name-port', because this returns also
@@ -2376,7 +2380,6 @@
                     (buffer-substring (point-min) (point-at-eol))))))
 
            ;; Reset the transfer process properties.
-           (tramp-message orig-vec 6 "\n%s" (buffer-string))
            (tramp-set-connection-property v "process-name" nil)
            (tramp-set-connection-property v "process-buffer" nil)))
 

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-03-06 13:23:04 +0000
+++ b/lisp/net/tramp.el 2014-03-17 09:28:47 +0000
@@ -3468,6 +3468,8 @@
 
 (defun tramp-action-out-of-band (proc vec)
   "Check, whether an out-of-band copy has finished."
+  ;; There might be pending output for the exit status.
+  (tramp-accept-process-output proc 0.1)
   (cond ((and (memq (process-status proc) '(stop exit))
              (zerop (process-exit-status proc)))
         (tramp-message vec 3 "Process has finished.")
@@ -4092,7 +4094,7 @@
 Furthermore, traces are written with verbosity of 6."
   (tramp-message
    (vector tramp-current-method tramp-current-user tramp-current-host nil nil)
-   6 "`%s %s' %s" program (mapconcat 'identity args " ") infile)
+   6 "`%s %s' %s %s" program (mapconcat 'identity args " ") infile destination)
   (if (executable-find program)
       (apply 'call-process program infile destination display args)
     1))
@@ -4229,7 +4231,7 @@
 ;; This function should produce a string which is grokked by a Unix
 ;; shell, even if the Emacs is running on Windows.  Since this is the
 ;; kludges section, we bind `system-type' in such a way that
-;; `shell-quote-arguments'  behaves as if on Unix.
+;; `shell-quote-argument' behaves as if on Unix.
 ;;
 ;; Thanks to Mario DeWeerd for the hint that it is sufficient for this
 ;; function to work with Bourne-like shells.