[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 560ff1d 037/173: Added TRAMP functions and i
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 560ff1d 037/173: Added TRAMP functions and improved messages. |
Date: |
Sat, 20 Oct 2018 10:36:26 -0400 (EDT) |
branch: externals/ssh-deploy
commit 560ff1dc22db3abb505ee72ffd681926d6d619c9
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Added TRAMP functions and improved messages.
---
ssh-deploy.el | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 6d1ea00..5f7531f 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -192,15 +192,16 @@
"Download REMOTE to LOCAL with the LOCAL-ROOT via ssh or ftp."
(if (or (string= (alist-get 'protocol remote) "ssh") (string= (alist-get
'protocol remote) "ftp"))
(progn
- (message "Downloading path '%s' to '%s'.." remote local)
- (let ((file-or-directory (file-regular-p local)))
- (if file-or-directory
+ (let ((path (concat (alist-get 'server remote) ":" (alist-get 'path
remote))))
+ (message "Downloading path '%s' to '%s'.." path local)
+ (let ((file-or-directory (file-regular-p local)))
+ (if file-or-directory
+ (if (string= (alist-get 'protocol remote) "ssh")
+ (ssh-deploy--download-file-via-ssh remote local)
+ (ssh-deploy--download-file-via-ftp remote local))
(if (string= (alist-get 'protocol remote) "ssh")
- (ssh-deploy--download-file-via-ssh remote local)
- (ssh-deploy--download-file-via-ftp remote local))
- (if (string= (alist-get 'protocol remote) "ssh")
- (ssh-deploy--download-directory-via-ssh remote local
local-root)
- (ssh-deploy--download-directory-via-ftp remote local
local-root)))))
+ (ssh-deploy--download-directory-via-ssh remote local
local-root)
+ (ssh-deploy--download-directory-via-ftp remote local
local-root))))))
(message "Unsupported protocol. Only SSH and FTP are supported at the
moment.")))
;; TODO: Left for further research, is it possible to make this asynchrous?
@@ -216,11 +217,24 @@
(message "Uploading directory '%s' to '%s' via TRAMP.." local
remote-path)
(copy-directory local remote-path t t)))))
+;; TODO: Left for further research, is it possible to make this asynchrous?
+(defun ssh-deploy--download-via-tramp (remote local local-root)
+ "Download REMOTE path to LOCAL and LOCAL-ROOT via tramp."
+ (let ((remote-path (concat "/" (alist-get 'protocol remote) ":"
(shell-quote-argument (alist-get 'username remote)) "@" (shell-quote-argument
(alist-get 'server remote)) ":" (shell-quote-argument (alist-get 'path
remote))))
+ (file-or-directory (file-regular-p local)))
+ (if file-or-directory
+ (progn
+ (message "Downloading file '%s' to '%s' via TRAMP.." remote-path
local)
+ (copy-file remote-path local t t))
+ (progn
+ (message "Download directory '%s' to '%s' via TRAMP.." remote-path
local)
+ (copy-directory remote-path local t t)))))
+
(defun ssh-deploy--upload (local remote local-root)
"Upload LOCAL to REMOTE and LOCAL-ROOT via ssh or ftp."
(if (or (string= (alist-get 'protocol remote) "ssh") (string= (alist-get
'protocol remote) "ftp"))
(progn
- (let ((path (concat (shell-quote-argument (alist-get 'username
remote)) "@" (shell-quote-argument (alist-get 'server remote)) ":"
(shell-quote-argument (alist-get 'path remote)))))
+ (let ((path (concat (alist-get 'server remote) ":" (alist-get 'path
remote))))
(message "Uploading path '%s' to '%s'.." local path)
(let ((file-or-directory (file-regular-p local)))
(if file-or-directory
- [elpa] externals/ssh-deploy 5ad07f2 008/173: Changed requirements., (continued)
- [elpa] externals/ssh-deploy 5ad07f2 008/173: Changed requirements., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 1ebf003 010/173: Formatted text a bit better., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy ebdbb7e 014/173: Add TRAMP protocol for difference queries, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy fa368fb 020/173: Made relative path generation as stand-alone function and now checks if ztree and tramp-term is installed before trying to call them., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy f4ad77d 026/173: Now works asynchrously, moved (revert-buffer) to successful downloads instead of to key-binding., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 05ed4c8 009/173: Made changes to comply with MELPA guidelines., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 89fb82a 038/173: Fixed bug when downloading via SSH to a local path containing whitespaces, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 965c68f 028/173: Centralized asynchronous shell commands., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy e6e1ad8 039/173: Updated version and modified date, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 2257f95 029/173: Fixed upload and downloads of root directories where local root directory name differs from remote root directory name., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 560ff1d 037/173: Added TRAMP functions and improved messages.,
Stefan Monnier <=
- [elpa] externals/ssh-deploy a86091c 032/173: Broken down diff function into multiple functions to easily add new protocols., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 1e58dc3 040/173: SSH deployment now works via TRAMP instead of SCP, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 4a2f947 053/173: Fixed bug where missing remote file used wrong logic, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 61a16be 047/173: Merged remote, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy d599659 015/173: Added support for opening remote terminals, uploads/downloads/differences of directories, browsing remote hosts and fixed a bug where paths with special chars were not handled correctly., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 1af0208 045/173: Cleaned up code structure and isolated functions, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 740c27d 054/173: Fixed message when no base revision exists and remote file equals local file, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy ac7aff8 052/173: Asynchronous detection of remote changes doesn't use any synchronous action, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy d4953c7 049/173: Fixed upload/download of root directory with different names, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 2d2c380 033/173: Implemented FTP via cURL but haven't tested it yet., Stefan Monnier, 2018/10/20