[elpa] externals/ssh-deploy e0bd19c 022/133: Removed obsolete arguments from directory-diff operations

[Stefan Monnier]

branch: externals/ssh-deploy
commit e0bd19cff8bbdc2bbec0080cc2f921d4e6e60d17
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Removed obsolete arguments from directory-diff operations
---
 ssh-deploy-diff-mode.el | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/ssh-deploy-diff-mode.el b/ssh-deploy-diff-mode.el
index f9010cc..502e30f 100644
--- a/ssh-deploy-diff-mode.el
+++ b/ssh-deploy-diff-mode.el
@@ -161,12 +161,10 @@
            (boundp 'ssh-deploy-root-remote)
            (fboundp 'ssh-deploy-diff-directories))
       (let ((root-local (nth 2 parts))
-            (root-remote (nth 3 parts))
-            (async (cond ((boundp 'ssh-deploy-async) ssh-deploy-async)(t 0)))
-            (exclude-list (cond ((boundp 'ssh-deploy-exclude-list) 
ssh-deploy-exclude-list)(t nil))))
+            (root-remote (nth 3 parts)))
         (progn
           (kill-this-buffer)
-          (ssh-deploy-diff-directories root-local root-remote exclude-list 
async)))))
+          (ssh-deploy-diff-directories root-local root-remote)))))
 
 (defun ssh-deploy-diff-mode--copy (parts)
   "Perform an upload or download depending on section in PARTS."
@@ -176,15 +174,13 @@
          (root-remote (nth 3 parts))
          (path-local (file-truename (expand-file-name file-name root-local)))
          (path-remote (expand-file-name file-name root-remote))
-         (section (nth 1 parts))
-         (async (cond ((boundp 'ssh-deploy-async) ssh-deploy-async)(t 0)))
-         (revision-folder (cond ((boundp 'ssh-deploy-revision-folder) 
ssh-deploy-revision-folder)(t nil))))
+         (section (nth 1 parts)))
     (if (and (fboundp 'ssh-deploy-download)
              (fboundp 'ssh-deploy-upload))
         (cond ((= section ssh-deploy-diff-mode--section-only-in-a)
-               (ssh-deploy-upload path-local path-remote t async 
revision-folder))
+               (ssh-deploy-upload path-local path-remote 1))
               ((= section ssh-deploy-diff-mode--section-only-in-b)
-               (ssh-deploy-download path-remote path-local async 
revision-folder))
+               (ssh-deploy-download path-remote path-local))
               (t (message "Copy is not available in this section")))
       (display-warning 'ssh-deploy "Function ssh-deploy-download or 
ssh-deploy-upload is missing" :warning))))
 
@@ -196,13 +192,11 @@
          (root-local (file-truename (nth 2 parts)))
          (root-remote (nth 3 parts))
          (path-local (file-truename (expand-file-name file-name root-local)))
-         (path-remote (expand-file-name file-name root-remote))
-         (async (cond ((boundp 'ssh-deploy-async) ssh-deploy-async)(t 0)))
-         (revision-folder (cond ((boundp 'ssh-deploy-revision-folder) 
ssh-deploy-revision-folder)(t nil))))
+         (path-remote (expand-file-name file-name root-remote)))
     (if (fboundp 'ssh-deploy-upload)
         (cond ((or (= section ssh-deploy-diff-mode--section-only-in-a)
                    (= section ssh-deploy-diff-mode--section-in-both))
-               (ssh-deploy-upload path-local path-remote 1 async 
revision-folder))
+               (ssh-deploy-upload path-local path-remote 1))
               (t "Copy A is not available in this section"))
       (display-warning 'ssh-deploy "Function ssh-deploy-upload is missing" 
:warning))))
 
@@ -214,13 +208,11 @@
          (root-local (file-truename (nth 2 parts)))
          (root-remote (nth 3 parts))
          (path-local (file-truename (expand-file-name file-name root-local)))
-         (path-remote (expand-file-name file-name root-remote))
-         (async (cond ((boundp 'ssh-deploy-async) ssh-deploy-async)(t 0)))
-         (revision-folder (cond ((boundp 'ssh-deploy-revision-folder) 
ssh-deploy-revision-folder)(t nil))))
+         (path-remote (expand-file-name file-name root-remote)))
     (if (fboundp 'ssh-deploy-download)
         (cond ((or (= section ssh-deploy-diff-mode--section-only-in-b)
                    (= section ssh-deploy-diff-mode--section-in-both))
-               (ssh-deploy-download path-remote path-local async 
revision-folder))
+               (ssh-deploy-download path-remote path-local))
               (t "Copy B is not available in this section"))
       (display-warning 'ssh-deploy "Function ssh-deploy-download is missing" 
:warning))))
 
@@ -232,19 +224,16 @@
          (root-local (nth 2 parts))
          (root-remote (nth 3 parts))
          (path-local (file-truename (expand-file-name file-name root-local)))
-         (path-remote (expand-file-name file-name root-remote))
-         (async (cond ((boundp 'ssh-deploy-async) ssh-deploy-async)(t 0)))
-         (debug (cond ((boundp 'ssh-deploy-debug) ssh-deploy-debug)(t 0)))
-         (exclude-list (cond ((boundp 'ssh-deploy-exclude-list) 
ssh-deploy-exclude-list)(t nil))))
+         (path-remote (expand-file-name file-name root-remote)))
     (if (and (fboundp 'ssh-deploy-delete)
              (fboundp 'ssh-deploy-delete-both))
         (cond ((= section ssh-deploy-diff-mode--section-in-both)
                (let ((yes-no-prompt (read-string (format "Type 'yes' to 
confirm that you want to delete the file '%s': " file-name))))
                  (if (string= yes-no-prompt "yes")
-                     (ssh-deploy-delete-both path-local root-local root-remote 
async debug exclude-list))))
-              ((= section ssh-deploy-diff-mode--section-only-in-a) 
(ssh-deploy-delete path-local async debug))
-              ((= section ssh-deploy-diff-mode--section-only-in-b) 
(ssh-deploy-delete path-remote async debug))
-              ((= section ssh-deploy-diff-mode--section-in-both) 
(ssh-deploy-delete-both path-local root-local root-remote async debug 
exclude-list))
+                     (ssh-deploy-delete-both path-local))))
+              ((= section ssh-deploy-diff-mode--section-only-in-a) 
(ssh-deploy-delete path-local))
+              ((= section ssh-deploy-diff-mode--section-only-in-b) 
(ssh-deploy-delete path-remote))
+              ((= section ssh-deploy-diff-mode--section-in-both) 
(ssh-deploy-delete-both path-local))
               (t (message "Delete is not available in this section")))
       (display-warning 'ssh-deploy "Function ssh-deploy-delete or 
ssh-deploy-delete-both is missing" :warning))))