[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 2c43901 112/133: Using ssh-deploy--diff-file
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 2c43901 112/133: Using ssh-deploy--diff-files instead of directly ediff-same-file-contents |
Date: |
Sat, 27 Mar 2021 14:48:54 -0400 (EDT) |
branch: externals/ssh-deploy
commit 2c43901a27f5ebca1e62d627c5f628b51a664e9b
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Using ssh-deploy--diff-files instead of directly ediff-same-file-contents
---
ssh-deploy.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index eba1433..832cb06 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -439,7 +439,7 @@
(lambda()
(if (or (> force 0) (not (file-exists-p path-remote))
(and (file-exists-p revision-path)
- (ediff-same-file-contents revision-path
path-remote)))
+ (nth 0 (ssh-deploy--diff-files revision-path
path-remote))))
(progn
(unless (file-directory-p (file-name-directory path-remote))
(make-directory (file-name-directory path-remote) t))
@@ -472,7 +472,7 @@
(if (or (> force 0)
(not (file-exists-p path-remote))
(and (file-exists-p revision-path)
- (ediff-same-file-contents revision-path path-remote)))
+ (nth 0 (ssh-deploy--diff-files revision-path
path-remote))))
(progn
(when (> ssh-deploy-verbose 0) (message "Uploading file '%s'
to '%s'.. (synchronously)" path-local path-remote))
(unless (file-directory-p (file-name-directory path-remote))
@@ -620,7 +620,7 @@
(lambda (file)
(let ((file-a (gethash file files-a-relative-hash))
(file-b (gethash file files-b-relative-hash)))
- (if (ediff-same-file-contents file-a file-b)
+ (if (nth 0 (ssh-deploy--diff-files file-a file-b))
(if (equal files-both-equals nil)
(setq files-both-equals (list file))
(push file files-both-equals))
@@ -806,11 +806,11 @@
;; Does a local revision of the file exist?
(if (file-exists-p revision-path)
- (if (ediff-same-file-contents revision-path
path-remote)
+ (if (nth 0 (ssh-deploy--diff-files revision-path
path-remote))
(list 4 (format "Remote file '%s' has not
changed." path-remote) path-local)
(list 5 (format "Remote file '%s' has changed
compared to local revision, please download or diff." path-remote) path-local
revision-path))
- (if (ediff-same-file-contents path-local path-remote)
+ (if (nth 0 (ssh-deploy--diff-files path-local
path-remote))
(list 6 (format "Remote file '%s' has not changed
compared to local file, created local revision." path-remote) path-local
revision-path)
(list 7 (format "Remote file '%s' has changed
compared to local file, please download or diff." path-remote) path-local
path-remote)))
- [elpa] externals/ssh-deploy 8c26f61 091/133: Updated version and change-date, (continued)
- [elpa] externals/ssh-deploy 8c26f61 091/133: Updated version and change-date, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 6d20dae 109/133: Fixed issue were async directory diff would lock main thread for resolving file links when using the handler, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 9c73fef 110/133: Added support for asynchronous file difference check, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 045e463 095/133: Trying emacs version manager in travis, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 438c1b4 107/133: Do not allow failures on emacs snapshot, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 24fec85 096/133: Added Travis build status to README, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 316395c 089/133: Updated version and date, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy f462007 105/133: More work on directory difference unit test, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 2f6a36e 101/133: Improved instructions for hydra and use-package, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 567e1d5 120/133: Work on feature to automatically update revisions, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 2c43901 112/133: Using ssh-deploy--diff-files instead of directly ediff-same-file-contents,
Stefan Monnier <=
- [elpa] externals/ssh-deploy aa93c35 123/133: Concatenation of remote file now done properly for directory diff, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 009e9f8 113/133: Added mode-line status for checking file difference, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy 016444c 122/133: Fixed bug with directory difference from deployment root or piped remote files, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy f910a4d 115/133: Passing verbose flag to remote changes handler, Stefan Monnier, 2021/03/27
- [elpa] externals/ssh-deploy d924c73 124/133: Merge pull request #60 from ShuguangSun/master, Stefan Monnier, 2021/03/27
- [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