[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy ac7aff8 052/173: Asynchronous detection of r
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy ac7aff8 052/173: Asynchronous detection of remote changes doesn't use any synchronous action |
Date: |
Sat, 20 Oct 2018 10:36:29 -0400 (EDT) |
branch: externals/ssh-deploy
commit ac7aff878411d61fe415efb6641394366343c380
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Asynchronous detection of remote changes doesn't use any synchronous action
---
ssh-deploy.el | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index f946c71..a045e84 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -3,8 +3,8 @@
;; Author: Christian Johansson <github.com/cjohansson>
;; Maintainer: Christian Johansson <github.com/cjohansson>
;; Created: 5 Jul 2016
-;; Modified: 30 Nov 2016
-;; Version: 1.43
+;; Modified: 6 Dec 2016
+;; Version: 1.44
;; Keywords: tools, convenience
;; URL: https://github.com/cjohansson/emacs-ssh-deploy
@@ -349,7 +349,7 @@
(ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
(if (and (ssh-deploy--is-not-empty-string buffer-file-name))
(let ((local-root (file-truename ssh-deploy-root-local))
- (remote-root (file-truename ssh-deploy-root-remote))
+ (remote-root ssh-deploy-root-remote)
(path (file-truename buffer-file-name)))
(if (ssh-deploy--file-is-in-path path local-root)
(progn
@@ -395,13 +395,16 @@
(if (ediff-same-contents
,path ,remote-path)
(progn
(copy-file ,path
,revision-path t t t t)
- (message "Remote
file has not changed, created base revision."))
- (display-warning
"ssh-deploy" "External file has changed, please download or diff." :warning)))
- (display-warning "ssh-deploy"
"Function ediff-same-contents is missing" :warning)))
+ 0)
+ 1))
+ 2))
(progn
(message "Remote file doesn't
exist"))))
(lambda(return-message)
- (message return-message))))
+ (lambda(return-message)
+ (if (= return-message 0) (message
"Remote file has not changed, created base revision.")
+ (if (= return-message 1)
(display-warning "ssh-deploy" "External file has changed, please download or
diff." :warning)
+ (if (= return-message 2)
(display-warning "ssh-deploy" "Function ediff-same-contents is missing"
:warning))))))))
(progn
(if (file-exists-p remote-path)
(progn
- [elpa] externals/ssh-deploy e6e1ad8 039/173: Updated version and modified date, (continued)
- [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, 2018/10/20
- [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 <=
- [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
- [elpa] externals/ssh-deploy f36ffce 059/173: Added MELPA Stable link, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 29cf0b2 061/173: Added force handler in documentation, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 3ea14de 062/173: Improved README for forced uploads, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy a1ea2c2 025/173: Improved description of complex connections, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 828aca3 022/173: Local path and local root is now evaluated based on their truenames., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy d40d817 027/173: Now displaying asynchrous process output., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy be5451c 019/173: Updated to comments and README, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 78d0641 031/173: Updated version and modification date., Stefan Monnier, 2018/10/20