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

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

[elpa] externals/ssh-deploy 3b69647 065/173: Whitespace fix


From: Stefan Monnier
Subject: [elpa] externals/ssh-deploy 3b69647 065/173: Whitespace fix
Date: Sat, 20 Oct 2018 10:36:31 -0400 (EDT)

branch: externals/ssh-deploy
commit 3b69647fb8e1168e018ac1e56dd0cbce7f3446d5
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Whitespace fix
---
 ssh-deploy.el | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ssh-deploy.el b/ssh-deploy.el
index 2f05d3b..130938b 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -138,9 +138,9 @@
   (let ((not-found t))
     (dolist (element ssh-deploy-exclude-list)
       (if (and (not (null element))
-             (not (null (string-match element path))))
-        (progn
-          (setq not-found nil))))
+               (not (null (string-match element path))))
+          (progn
+            (setq not-found nil))))
     not-found))
 
 (defun ssh-deploy--get-relative-path (root path)
@@ -201,10 +201,10 @@
                                   (list 0 (format "Upload '%s' completed." 
,remote-path)))
                               (list 1 (format "External file '%s' has changed, 
please download or diff." ,remote-path))))
                         (list 1 "Function ediff-same-file-contents is 
missing.")))
-                 (lambda(return)
-                   (if (= (nth 0 return) 0)
-                       (message (nth 1 return))
-                     (display-warning "ssh-deploy" (nth 1 return) 
:warning))))))
+                   (lambda(return)
+                     (if (= (nth 0 return) 0)
+                         (message (nth 1 return))
+                       (display-warning "ssh-deploy" (nth 1 return) 
:warning))))))
             (progn
               (message "Uploading directory '%s' to '%s' via tramp 
asynchronously.." local remote-path)
               (if (string= remote-path (alist-get 'string remote))
@@ -332,7 +332,7 @@
 (defun ssh-deploy (local-root remote-root upload-or-download path debug async 
force)
   "Upload/Download file or directory relative to the roots LOCAL-ROOT with 
REMOTE-ROOT via ssh or ftp according to UPLOAD-OR-DOWNLOAD and the path PATH, 
DEBUG enables some feedback messages and ASYNC determines if transfers should 
be asynchrous or not, FORCE upload despite external change."
   (if (and (ssh-deploy--file-is-in-path path local-root)
-         (ssh-deploy--file-is-included path))
+           (ssh-deploy--file-is-included path))
       (progn
         (let ((file-or-directory (file-regular-p path)))
           (let ((remote-path (concat remote-root 
(ssh-deploy--get-relative-path local-root path))))
@@ -383,7 +383,7 @@
                 (remote-root ssh-deploy-root-remote)
                 (path (file-truename buffer-file-name)))
             (if (and (ssh-deploy--file-is-in-path path local-root)
-                   (ssh-deploy--file-is-included path))
+                     (ssh-deploy--file-is-included path))
                 (progn
                   (let ((revision-path (ssh-deploy--get-revision-path path))
                         (remote-path (concat remote-root 
(ssh-deploy--get-relative-path local-root path))))
@@ -407,8 +407,8 @@
                                             (list 0 (format "Remote file '%s' 
doesn't exist." ,remote-path))))
                                        (lambda(return)
                                          (if (= (nth 0 return) 0)
-                                           (message (nth 1 return))
-                                         (display-warning "ssh-deploy" (nth 1 
return) :warning)))))
+                                             (message (nth 1 return))
+                                           (display-warning "ssh-deploy" (nth 
1 return) :warning)))))
                                   (progn
                                     (if (file-exists-p remote-path)
                                         (progn
@@ -437,10 +437,10 @@
                                                       (list 1 (format 
"External file has '%s' changed, please download or diff." ,remote-path))))
                                                 (list 1 "Function 
ediff-file-same-contents is missing")))
                                           (list 0 (format "Remote file '%s' 
doesn't exist." ,remote-path))))
-                                   (lambda(return)
-                                     (if (= (nth 0 return) 0)
-                                         (message (nth 1 return))
-                                       (display-warning "ssh-deploy" (nth 1 
return) :warning)))))
+                                     (lambda(return)
+                                       (if (= (nth 0 return) 0)
+                                           (message (nth 1 return))
+                                         (display-warning "ssh-deploy" (nth 1 
return) :warning)))))
                                 (progn
                                   (if (file-exists-p remote-path)
                                       (progn
@@ -453,7 +453,7 @@
                                                     (message "Remote file '%s' 
has not changed, created base revision." remote-path))
                                                 (display-warning "ssh-deploy" 
(format "External file '%s' has changed, please download or diff." remote-path) 
:warning)))
                                           (display-warning "ssh-deploy" 
"Function ediff-same-file-contents is missing." :warning)))
-                                  (message "Remote file '%s' doesn't exist." 
remote-path)))))))))))))))
+                                    (message "Remote file '%s' doesn't exist." 
remote-path)))))))))))))))
 
 ;;;### autoload
 (defun ssh-deploy-download-handler ()
@@ -475,7 +475,7 @@
 (defun ssh-deploy-diff-handler ()
   "Compare current path with remote host if it is configured for deployment."
   (if (and (ssh-deploy--is-not-empty-string ssh-deploy-root-local)
-         (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
+           (ssh-deploy--is-not-empty-string ssh-deploy-root-remote))
       (if (and (ssh-deploy--is-not-empty-string buffer-file-name)
                (file-exists-p buffer-file-name))
           (let ((local-path (file-truename buffer-file-name))
@@ -508,7 +508,7 @@
   "Find differences relative to the roots LOCAL-ROOT with REMOTE-ROOT-STRING 
and the path PATH, DEBUG enables feedback message."
   (let ((file-or-directory (file-regular-p path)))
     (if (and (ssh-deploy--file-is-in-path path local-root)
-           (ssh-deploy--file-is-included path))
+             (ssh-deploy--file-is-included path))
         (progn
           (let ((remote-path (concat remote-root-string 
(ssh-deploy--get-relative-path local-root path))))
             (let ((remote (ssh-deploy--parse-remote remote-path)))
@@ -536,7 +536,7 @@
 (defun ssh-deploy-browse-remote (local-root remote-root-string path)
   "Browse relative to LOCAL-ROOT on REMOTE-ROOT-STRING the path PATH in 
`dired-mode`."
   (if (and (ssh-deploy--file-is-in-path path local-root)
-         (ssh-deploy--file-is-included path))
+           (ssh-deploy--file-is-included path))
       (let ((remote-path (concat remote-root-string 
(ssh-deploy--get-relative-path local-root path))))
         (let ((remote-root (ssh-deploy--parse-remote remote-path)))
           (let ((command (concat "/" (alist-get 'protocol remote-root) ":" 
(alist-get 'username remote-root) "@" (alist-get 'server remote-root) ":" 
(alist-get 'path remote-root))))



reply via email to

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