[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 2e3cf30 016/133: Fixed issue with directory
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 2e3cf30 016/133: Fixed issue with directory differences |
Date: |
Sat, 27 Mar 2021 14:48:35 -0400 (EDT) |
branch: externals/ssh-deploy
commit 2e3cf301a0f4305e5f2aa134046af1fb64b3aa2f
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Fixed issue with directory differences
---
ssh-deploy.el | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 710b00c..7975c9c 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -755,7 +755,7 @@
(lambda()
(add-to-list 'load-path script-filename)
(require 'ssh-deploy)
- (ssh-deploy--diff-directories-data directory-a directory-b (list
@exclude-list))) ;; Flycheck complains - why?
+ (ssh-deploy--diff-directories-data directory-a directory-b (list
exclude-list))) ;; Flycheck complains - why?
(lambda(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))
@@ -779,7 +779,6 @@
(if (and (ssh-deploy--file-is-in-path path-local root-local)
(ssh-deploy--file-is-included path-local exclude-list))
(let* ((revision-folder (or revision-folder
ssh-deploy-revision-folder))
- (exclude-list (or exclude-list ssh-deploy-exclude-list))
(revision-path (ssh-deploy--get-revision-path path-local
revision-folder))
(path-remote (expand-file-name (ssh-deploy--get-relative-path
root-local path-local) root-remote)))
@@ -950,9 +949,8 @@
(defun ssh-deploy-delete-both (path-local &optional root-local root-remote
async debug exclude-list)
"Delete PATH-LOCAL relative to ROOT-LOCAL as well as on ROOT-REMOTE, do it
asynchronously if ASYNC is non-nil, debug if DEBUG is non-nil, check if path is
excluded in EXCLUDE-LIST."
(let ((root-local (or root-local ssh-deploy-root-local))
- (root-remote (or root-remote ssh-deploy-root-remote)))
- (if (not exclude-list)
- (setq exclude-list ssh-deploy-exclude-list))
+ (root-remote (or root-remote ssh-deploy-root-remote))
+ (exclude-list (or exclude-list ssh-deploy-exclude-list)))
(if (and (ssh-deploy--file-is-in-path path-local root-local)
(ssh-deploy--file-is-included path-local exclude-list))
(let ((path-remote (expand-file-name (ssh-deploy--get-relative-path
root-local path-local) root-remote)))
@@ -963,19 +961,16 @@
;;;###autoload
(defun ssh-deploy-rename (old-path-local new-path-local &optional root-local
root-remote async debug exclude-list with-threads)
"Rename OLD-PATH-LOCAL to NEW-PATH-LOCAL under ROOT-LOCAL as well as on
ROOT-REMOTE, do it asynchronously if ASYNC is non-nil, debug if DEBUG is
non-nil but check if path is excluded in EXCLUDE-LIST first. Use
multi-threading if WITH-THREADS is above zero."
- (if (not debug)
- (setq debug ssh-deploy-debug))
- (if (not async)
- (setq async ssh-deploy-async))
(let ((root-local (or root-local ssh-deploy-root-local))
(root-remote (or root-remote ssh-deploy-root-remote))
- (exclude-list (or exclude-list ssh-deploy-exclude-list)))
+ (exclude-list (or exclude-list ssh-deploy-exclude-list))
+ (debug (or debug ssh-deploy-debug))
+ (async (or async ssh-deploy-async)))
(if (and (ssh-deploy--file-is-in-path old-path-local root-local)
(ssh-deploy--file-is-in-path new-path-local root-local)
(ssh-deploy--file-is-included old-path-local exclude-list)
(ssh-deploy--file-is-included new-path-local exclude-list))
- (let ((exclude-list (or exclude-list ssh-deploy-exclude-list))
- (old-path-remote (expand-file-name
(ssh-deploy--get-relative-path root-local old-path-local) root-remote))
+ (let ((old-path-remote (expand-file-name
(ssh-deploy--get-relative-path root-local old-path-local) root-remote))
(new-path-remote (expand-file-name
(ssh-deploy--get-relative-path root-local new-path-local) root-remote)))
(ssh-deploy--mode-line-set-status-and-update
ssh-deploy--status-renaming)
(rename-file old-path-local new-path-local t)
- [elpa] externals/ssh-deploy a12e59f 027/133: Updated comments, (continued)
- [elpa] externals/ssh-deploy a12e59f 027/133: Updated comments, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy c1f8837 029/133: Updated documentation with pre-defined hydra and pre-fix map, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d548011 036/133: Fixed bug with constant definition, Stefan Monnier, 2021/03/27
- [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 <=
- [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, 2021/03/27
- [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