[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy e0bd19c 022/133: Removed obsolete arguments
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy e0bd19c 022/133: Removed obsolete arguments from directory-diff operations |
Date: |
Sat, 27 Mar 2021 14:48:36 -0400 (EDT) |
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))))
- [elpa] externals/ssh-deploy d853e2f 040/133: Fixed issue with passing local variables to diff-mode, (continued)
- [elpa] externals/ssh-deploy d853e2f 040/133: Fixed issue with passing local variables to diff-mode, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 98c00bb 042/133: Fixed bug with synchronous forced uploads, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 103588b 050/133: Running custom script asynchronously loads ssh-deploy library, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 2b3a531 012/133: Updated date, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d7a42fe 015/133: Replaced (concat) with (expand-file-name), Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 80cd448 011/133: Merge branch 'master' of https://github.com/cjohansson/emacs-ssh-deploy, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 861f1c7 013/133: Updated documentation, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 2e3cf30 016/133: Fixed issue with directory differences, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d5386ab 018/133: Renamed internal argument with-threads to async-with-threads, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy cb4c6ff 020/133: Using (expand-file-name) instead of (concat), Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy e0bd19c 022/133: Removed obsolete arguments from directory-diff operations,
Stefan Monnier <=
- [elpa] externals/ssh-deploy 102943f 028/133: Added pre-defined prefix key map, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy afbcc70 030/133: mode-line now shows whether current file is under deployment, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 0e7c608 031/133: Deployment menu only shows when current buffer is deployment, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 8dadac5 032/133: Made menu-bar feature optional, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy b409812 033/133: Started on implementing changes to diff-mode, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 13dcacb 034/133: More cosmetic changes to diff mode, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 4268c8b 035/133: Fixed bug with constant definition, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 7be2881 038/133: Fixed proper symbols for actions, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 3c5fe09 037/133: More work on diff mode cosmetic changes, Stefan Monnier, 2021/03/27