[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 4c3eee5 059/133: Fixed issue were checking v
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 4c3eee5 059/133: Fixed issue were checking verbose variable was expecting boolean instead of integer |
Date: |
Sat, 27 Mar 2021 14:48:43 -0400 (EDT) |
branch: externals/ssh-deploy
commit 4c3eee5feb4c3d1f08a60d4a286fa9a571dc7c57
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Fixed issue were checking verbose variable was expecting boolean instead of
integer
---
ssh-deploy.el | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 5f9457e..81dc6de 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -412,7 +412,7 @@
(ssh-deploy--mode-line-set-status-and-update ssh-deploy--status-uploading
path-local)
(if file-or-directory
(let ((revision-path (ssh-deploy--get-revision-path path-local
revision-folder)))
- (when ssh-deploy-verbose (message "Uploading file '%s' to '%s'..
(asynchronously)" path-local path-remote))
+ (when (> ssh-deploy-verbose 0) (message "Uploading file '%s' to
'%s'.. (asynchronously)" path-local path-remote))
(ssh-deploy--async-process
(lambda()
(require 'ediff-util)
@@ -429,17 +429,17 @@
(lambda(return)
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-idle (nth 2 return))
(if (= (nth 0 return) 0)
- (when ssh-deploy-verbose (message (nth 1 return)))
+ (when (> ssh-deploy-verbose 0) (message (nth 1 return)))
(display-warning 'ssh-deploy (nth 1 return) :warning)))
async-with-threads))
- (when ssh-deploy-verbose (message "Uploading directory '%s' to '%s'..
(asynchronously)" path-local path-remote))
+ (when (> ssh-deploy-verbose 0) (message "Uploading directory '%s' to
'%s'.. (asynchronously)" path-local path-remote))
(ssh-deploy--async-process
(lambda()
(copy-directory path-local path-remote t t t)
path-local)
(lambda(return-path)
(ssh-deploy--mode-line-set-status-and-update ssh-deploy--status-idle
return-path)
- (when ssh-deploy-verbose (message "Completed upload of directory
'%s'. (asynchronously)" return-path)))))))
+ (when (> ssh-deploy-verbose 0) (message "Completed upload of
directory '%s'. (asynchronously)" return-path)))))))
(defun ssh-deploy--upload-via-tramp (path-local path-remote force
revision-folder)
"Upload PATH-LOCAL to PATH-REMOTE via Tramp synchronously and FORCE despite
remote change compared with copy in REVISION-FOLDER."
@@ -454,25 +454,25 @@
(not (file-exists-p path-remote))
(and (file-exists-p revision-path)
(ediff-same-file-contents revision-path path-remote)))
(progn
- (when ssh-deploy-verbose (message "Uploading file '%s' to
'%s'.. (synchronously)" path-local path-remote))
+ (when (> ssh-deploy-verbose 0) (message "Uploading file
'%s' to '%s'.. (synchronously)" path-local path-remote))
(unless (file-directory-p (file-name-directory
path-remote))
(make-directory (file-name-directory path-remote) t))
(copy-file path-local path-remote t t t t)
(ssh-deploy-store-revision path-local revision-folder)
- (when ssh-deploy-verbose (message "Completed upload of
'%s'. (synchronously)" path-local)))
+ (when (> ssh-deploy-verbose 0) (message "Completed upload
of '%s'. (synchronously)" path-local)))
(display-warning 'ssh-deploy (format "Remote file '%s' has
changed, please download or diff. (synchronously)" path-remote) :warning))
(display-warning 'ssh-deploy "Function 'ediff-same-file-contents'
is missing." :warning))
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-idle))
- (when ssh-deploy-verbose (message "Uploading directory '%s' to '%s'..
(synchronously)" path-local path-remote))
+ (when (> ssh-deploy-verbose 0) (message "Uploading directory '%s' to
'%s'.. (synchronously)" path-local path-remote))
(copy-directory path-local path-remote t t t)
(ssh-deploy--mode-line-set-status-and-update ssh-deploy--status-idle)
- (when ssh-deploy-verbose (message "Completed upload of '%s'.
(synchronously)" path-local)))))
+ (when (> ssh-deploy-verbose 0) (message "Completed upload of '%s'.
(synchronously)" path-local)))))
(defun ssh-deploy--download-via-tramp-async (path-remote path-local
revision-folder async-with-threads)
"Download PATH-REMOTE to PATH-LOCAL via Tramp asynchronously and make a copy
in REVISION-FOLDER, use multi-threading if ASYNC-WITH-THREADS is above zero."
(let ((revision-path (ssh-deploy--get-revision-path path-local
revision-folder)))
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-downloading path-local)
- (when ssh-deploy-verbose (message "Downloading '%s' to '%s'..
(asynchronously)" path-remote path-local))
+ (when (> ssh-deploy-verbose 0) (message "Downloading '%s' to '%s'..
(asynchronously)" path-remote path-local))
(ssh-deploy--async-process
(lambda()
(let ((file-or-directory (not (file-directory-p path-remote))))
@@ -486,7 +486,7 @@
path-local))
(lambda(return-path)
(ssh-deploy--mode-line-set-status-and-update ssh-deploy--status-idle
return-path)
- (when ssh-deploy-verbose (message "Completed download of '%s'.
(asynchronously)" return-path))
+ (when (> ssh-deploy-verbose 0) (message "Completed download of '%s'.
(asynchronously)" return-path))
(let ((local-buffer (find-buffer-visiting return-path)))
(when local-buffer
(with-current-buffer local-buffer
@@ -499,13 +499,13 @@
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-downloading)
(if file-or-directory
(progn
- (when ssh-deploy-verbose (message "Downloading file '%s' to '%s'..
(synchronously)" path-remote path-local))
+ (when (> ssh-deploy-verbose 0) (message "Downloading file '%s' to
'%s'.. (synchronously)" path-remote path-local))
(unless (file-directory-p (file-name-directory path-local))
(make-directory (file-name-directory path-local) t))
(copy-file path-remote path-local t t t t)
(ssh-deploy-store-revision path-local revision-folder)
(ssh-deploy--mode-line-set-status-and-update ssh-deploy--status-idle)
- (when ssh-deploy-verbose (message "Completed download of file '%s'.
(synchronously)" path-local)))
+ (when (> ssh-deploy-verbose 0) (message "Completed download of file
'%s'. (synchronously)" path-local)))
(message "Downloading directory '%s' to '%s'.. (synchronously)"
path-remote path-local)
(copy-directory path-remote path-local t t t)
(ssh-deploy--mode-line-set-status-and-update ssh-deploy--status-idle)
@@ -766,7 +766,7 @@
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-idle (nth 2 return))
(if (= (nth 0 return) 0)
- (when ssh-deploy-verbose (message (nth 1
return)))
+ (when (> ssh-deploy-verbose 0) (message (nth
1 return)))
(display-warning 'ssh-deploy (nth 1 return)
:warning)))
async-with-threads))
@@ -781,10 +781,10 @@
(require 'ediff-util)
(if (fboundp 'ediff-same-file-contents)
(if (ediff-same-file-contents revision-path
path-remote)
- (when ssh-deploy-verbose (message "Remote
file '%s' has not changed. (synchronously)" path-remote))
+ (when (> ssh-deploy-verbose 0) (message
"Remote file '%s' has not changed. (synchronously)" path-remote))
(display-warning 'ssh-deploy (format "Remote
file '%s' has changed, please download or diff. (synchronously)" path-remote)
:warning))
(display-warning 'ssh-deploy "Function
'ediff-same-file-contents' is missing. (synchronously)" :warning)))
- (when ssh-deploy-verbose (message "Remote file '%s'
doesn't exist. (synchronously)" path-remote)))
+ (when (> ssh-deploy-verbose 0) (message "Remote file
'%s' doesn't exist. (synchronously)" path-remote)))
;; Update buffer status to idle
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-idle))
@@ -818,7 +818,7 @@
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-idle (nth 2 return))
(if (= (nth 0 return) 0)
- (when ssh-deploy-verbose (message (nth 1
return)))
+ (when (> ssh-deploy-verbose 0) (message (nth 1
return)))
(display-warning 'ssh-deploy (nth 1 return)
:warning)))
async-with-threads))
@@ -835,10 +835,10 @@
(if (ediff-same-file-contents path-local
path-remote)
(progn
(copy-file path-local revision-path t t t
t)
- (when ssh-deploy-verbose (message "Remote
file '%s' has not changed, created base revision. (synchronously)"
path-remote)))
+ (when (> ssh-deploy-verbose 0) (message
"Remote file '%s' has not changed, created base revision. (synchronously)"
path-remote)))
(display-warning 'ssh-deploy (format "Remote
file '%s' has changed, please download or diff. (synchronously)" path-remote)
:warning))
(display-warning 'ssh-deploy "Function
'ediff-same-file-contents' is missing. (synchronously)" :warning)))
- (when ssh-deploy-verbose (message "Remote file '%s' does
not exist. (synchronously)" path-remote)))
+ (when (> ssh-deploy-verbose 0) (message "Remote file
'%s' does not exist. (synchronously)" path-remote)))
;; Update buffer status to idle
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-idle))))
@@ -1017,7 +1017,7 @@
(unless (file-directory-p path)
(let* ((root (or root ssh-deploy-revision-folder))
(revision-path (ssh-deploy--get-revision-path path root)))
- (when ssh-deploy-verbose (message "Storing revision of '%s' at '%s'.."
path revision-path))
+ (when (> ssh-deploy-verbose 0) (message "Storing revision of '%s' at
'%s'.." path revision-path))
(copy-file path revision-path t t t t))))
;;;###autoload
@@ -1131,7 +1131,7 @@
(let* ((root-local (file-truename ssh-deploy-root-local))
(path-local (file-truename buffer-file-name))
(path-remote (expand-file-name (ssh-deploy--get-relative-path
root-local path-local) ssh-deploy-root-remote)))
- (when ssh-deploy-verbose (message "Opening file on remote '%s'"
path-remote))
+ (when (> ssh-deploy-verbose 0) (message "Opening file on remote '%s'"
path-remote))
(find-file path-remote))))
;;;###autoload
- [elpa] externals/ssh-deploy 2c43901 112/133: Using ssh-deploy--diff-files instead of directly ediff-same-file-contents, (continued)
- [elpa] externals/ssh-deploy 2c43901 112/133: Using ssh-deploy--diff-files instead of directly ediff-same-file-contents, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy aa93c35 123/133: Concatenation of remote file now done properly for directory diff, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 009e9f8 113/133: Added mode-line status for checking file difference, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 016444c 122/133: Fixed bug with directory difference from deployment root or piped remote files, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy f910a4d 115/133: Passing verbose flag to remote changes handler, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d924c73 124/133: Merge pull request #60 from ShuguangSun/master, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy a6629c1 130/133: Update ssh-deploy.el, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 1bb2f82 129/133: Added support for forced uploads on explicit save actions, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy cc91b56 132/133: Updated README and version, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy e73907d 063/133: Changed test command, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 4c3eee5 059/133: Fixed issue were checking verbose variable was expecting boolean instead of integer,
Stefan Monnier <=
- [elpa] externals/ssh-deploy a57ae0c 061/133: Updated use-package example to work with byte-compiled code, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 77f0a1d 070/133: Byte-compilation working for unit test without warning, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 54f664b 081/133: Added unit tests for async.el if it's loaded, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy e4d1403 086/133: Added async.el autoload for new change detection and pushed version, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 65d58c3 106/133: Added unit test for directory difference, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 7ad73a4 103/133: Unit test for directory difference passing, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 8f358b1 102/133: Started on unit test for directory differences, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy e2db9c7 117/133: Fixed unit test for directory differences where directories are symbolic, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy ded455b 126/133: More idiomatic code for status updates, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy e10221e 127/133: Using (string-prefix-p) instead of (string-match) for checking if path is in root, Stefan Monnier, 2021/03/27