branch: externals/ssh-deploy
commit 715325d99df453f4e2fd5f8aacab0ae0a4886cb4
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Improved wording of directory difference calculation
---
ssh-deploy.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 5aa4dfa..e6fbe3b 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: 18 Apr 2018
-;; Version: 1.85
+;; Modified: 20 Apr 2018
+;; Version: 1.86
;; Keywords: tools, convenience
;; URL: https://github.com/cjohansson/emacs-ssh-deploy
@@ -592,20 +592,20 @@
(setq exclude-list ssh-deploy-exclude-list))
(if (and async (fboundp 'async-start))
(let ((script-filename (file-name-directory (symbol-file
'ssh-deploy-diff-directories))))
- (message "Generating differences between directory '%s' and '%s'..
(asynchronously)" directory-a directory-b)
+ (message "Calculating differences between directory '%s' and '%s'..
(asynchronously)" directory-a directory-b)
(async-start
`(lambda()
(add-to-list 'load-path ,script-filename)
(require 'ssh-deploy)
(ssh-deploy--diff-directories-data ,directory-a ,directory-b (list
,@exclude-list)))
(lambda(diff)
- (message "Completed calculated differences between directory '%s'
and '%s'. Result: %s only in A, %s only in B, %s differs. (asynchronously)"
(nth 0 diff) (nth 1 diff) (length (nth 4 diff)) (length (nth 5 diff)) (length
(nth 7 diff)))
+ (message "Completed calculation of differences between directory
'%s' and '%s'. Result: %s only in A, %s only in B, %s differs.
(asynchronously)" (nth 0 diff) (nth 1 diff) (length (nth 4 diff)) (length (nth
5 diff)) (length (nth 7 diff)))
(if (or (> (length (nth 4 diff)) 0) (> (length (nth 5 diff)) 0) (>
(length (nth 7 diff)) 0))
(ssh-deploy--diff-directories-present diff)))))
(progn
- (message "Generating differences between directory '%s' and '%s'..
(synchronously)" directory-a directory-b)
+ (message "Calculating differences between directory '%s' and '%s'..
(synchronously)" directory-a directory-b)
(let ((diff (ssh-deploy--diff-directories-data directory-a directory-b
exclude-list)))
- (message "Completed calculated differences between directory '%s' and
'%s'. Result: %s only in A, %s only in B, %s differs. (synchronously)" (nth 0
diff) (nth 1 diff) (length (nth 4 diff)) (length (nth 5 diff)) (length (nth 7
diff)))
+ (message "Completed calculation of differences between directory '%s'
and '%s'. Result: %s only in A, %s only in B, %s differs. (synchronously)" (nth
0 diff) (nth 1 diff) (length (nth 4 diff)) (length (nth 5 diff)) (length (nth 7
diff)))
(if (or (> (length (nth 4 diff)) 0) (> (length (nth 5 diff)) 0) (>
(length (nth 7 diff)) 0))
(ssh-deploy--diff-directories-present diff))))))
