emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ssh-deploy f61f1ef 041/133: Fixed bug where all Directo


From: Stefan Monnier
Subject: [elpa] externals/ssh-deploy f61f1ef 041/133: Fixed bug where all DirectoryVariables was not passed on from handlers
Date: Sat, 27 Mar 2021 14:48:40 -0400 (EDT)

branch: externals/ssh-deploy
commit f61f1efe6bddc366ab24f9d6b51a2129172c64ea
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Fixed bug where all DirectoryVariables was not passed on from handlers
---
 ssh-deploy.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ssh-deploy.el b/ssh-deploy.el
index 585a2f6..2dd0cbd 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -4,7 +4,7 @@
 ;; Maintainer: Christian Johansson <christian@cvj.se>
 ;; Created: 5 Jul 2016
 ;; Modified: 4 Nov 2018
-;; Version: 2.06
+;; Version: 2.07
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-ssh-deploy
 
@@ -1096,7 +1096,7 @@
                  (ssh-deploy--file-is-in-path path-local root-local)
                  (ssh-deploy--file-is-included path-local 
ssh-deploy-exclude-list))
             (let ((path-remote (expand-file-name 
(ssh-deploy--get-relative-path root-local path-local) ssh-deploy-root-remote)))
-              (ssh-deploy-upload path-local path-remote force ssh-deploy-async 
ssh-deploy-revision-folder))
+              (ssh-deploy-upload path-local path-remote force ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-async-with-threads))
           (when (> ssh-deploy-debug 0) (message "Ignoring upload, path '%s' is 
empty, not in the root '%s' or is excluded from it." path-local root-local))))))
 
 ;;;###autoload
@@ -1114,7 +1114,7 @@
            (ssh-deploy--is-not-empty-string buffer-file-name))
       (progn
         (when (> ssh-deploy-debug 0) (message "Detecting remote-changes.."))
-        (ssh-deploy-remote-changes (file-truename buffer-file-name) 
(file-truename ssh-deploy-root-local) ssh-deploy-root-remote ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-exclude-list))
+        (ssh-deploy-remote-changes (file-truename buffer-file-name) 
(file-truename ssh-deploy-root-local) ssh-deploy-root-remote ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-exclude-list 
ssh-deploy-async-with-threads))
     (when (> ssh-deploy-debug 0) (message "Ignoring remote-changes check since 
a root is empty or the current buffer lacks a file-name."))))
 
 ;;;###autoload
@@ -1162,7 +1162,7 @@
                  (ssh-deploy--file-is-in-path path-local root-local)
                  (ssh-deploy--file-is-included path-local 
ssh-deploy-exclude-list))
             (let ((path-remote (expand-file-name 
(ssh-deploy--get-relative-path root-local path-local) ssh-deploy-root-remote)))
-              (ssh-deploy-download path-remote path-local ssh-deploy-async 
ssh-deploy-revision-folder))
+              (ssh-deploy-download path-remote path-local ssh-deploy-async 
ssh-deploy-revision-folder ssh-deploy-async-with-threads))
           (when (> ssh-deploy-debug 0) (message "Ignoring upload, path '%s' is 
empty, not in the root '%s' or is excluded from it." path-local root-local))))))
 
 ;;;###autoload
@@ -1219,7 +1219,7 @@
                  (new-path-local-tmp (read-file-name "New file name:" 
(file-name-directory old-path-local) basename nil basename))
                  (new-path-local (file-truename new-path-local-tmp)))
             (if (not (string= old-path-local new-path-local))
-                (ssh-deploy-rename old-path-local new-path-local root-local 
ssh-deploy-root-remote ssh-deploy-async ssh-deploy-debug)))
+                (ssh-deploy-rename old-path-local new-path-local root-local 
ssh-deploy-root-remote ssh-deploy-async ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async-with-threads)))
         (if (and (ssh-deploy--is-not-empty-string default-directory)
                  (file-exists-p default-directory))
             (let* ((old-path-local (file-truename default-directory))
@@ -1228,7 +1228,7 @@
                    (new-path-local-tmp (read-file-name "New directory name:" 
(file-name-directory old-path-local) basename nil basename))
                    (new-path-local (file-truename new-path-local-tmp)))
               (if (not (string= old-path-local new-path-local))
-                  (ssh-deploy-rename old-path-local new-path-local root-local 
ssh-deploy-root-remote ssh-deploy-async ssh-deploy-debug 
ssh-deploy-exclude-list)))))))
+                  (ssh-deploy-rename old-path-local new-path-local root-local 
ssh-deploy-root-remote ssh-deploy-async ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async-with-threads)))))))
 
 ;;;###autoload
 (defun ssh-deploy-remote-terminal-eshell-handler ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]