[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 7ad73a4 103/133: Unit test for directory dif
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 7ad73a4 103/133: Unit test for directory difference passing |
Date: |
Sat, 27 Mar 2021 14:48:53 -0400 (EDT) |
branch: externals/ssh-deploy
commit 7ad73a41e89cda19c775f2150af5e0bda35a86b1
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Unit test for directory difference passing
---
ssh-deploy-test.el | 2 +-
ssh-deploy.el | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ssh-deploy-test.el b/ssh-deploy-test.el
index 21c6e59..a1a8a49 100644
--- a/ssh-deploy-test.el
+++ b/ssh-deploy-test.el
@@ -408,7 +408,7 @@
(should (equal
(ssh-deploy--diff-directories-data directory-a directory-b
ssh-deploy-exclude-list)
- (list directory-a directory-b ssh-deploy-exclude-list (list
file-1-filename file-2-filename) nil (list file-1-filename file-2-filename)
nil)))
+ (list directory-a directory-b ssh-deploy-exclude-list (list
file-1-filename file-2-filename) nil nil (list file-1-filename file-2-filename)
nil)))
;; Delete test files
(delete-file file-b-2)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 918d9ba..11ab352 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -617,6 +617,7 @@
(setq files-a-only (list file-a))
(push file-a files-a-only))))
files-a-relative-list)
+ (setq files-a-only (sort files-a-only #'string<))
;; Collect files that only exists in directory b
(mapc
@@ -627,6 +628,7 @@
(setq files-b-only (list file-b))
(push file-b files-b-only))))
files-b-relative-list)
+ (setq files-b-only (sort files-b-only #'string<))
;; Collect files that differ in contents and have equal contents
(mapc
@@ -641,6 +643,9 @@
(setq files-both-differs (list file))
(push file files-both-differs)))))
files-both)
+ (setq files-both (sort files-both #'string<))
+ (setq files-both-equals (sort files-both-equals #'string<))
+ (setq files-both-differs (sort files-both-differs #'string<))
(list directory-a directory-b exclude-list files-both files-a-only
files-b-only files-both-equals files-both-differs))
(display-warning 'ssh-deploy "Both directories need to exist to
perform difference generation." :warning))
- [elpa] externals/ssh-deploy a6629c1 130/133: Update ssh-deploy.el, (continued)
- [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, 2021/03/27
- [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 <=
- [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
- [elpa] externals/ssh-deploy fce4ea3 133/133: Merge remote-tracking branch 'upstream/ssh-deploy/main' into externals/ssh-deploy, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 5b263c1 045/133: Some changes from ELPA merged, Stefan Monnier, 2021/03/27