[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ssh-deploy 56da852 066/173: Fixed bug where plug-in rep
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ssh-deploy 56da852 066/173: Fixed bug where plug-in reported external changes even though remote |
Date: |
Sat, 20 Oct 2018 10:36:31 -0400 (EDT) |
branch: externals/ssh-deploy
commit 56da852dd3b34add0b2cce499cb07f076767a976
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Fixed bug where plug-in reported external changes even though remote
and local was identical, now ignore when remote differs from local revision
---
ssh-deploy.el | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 130938b..b1afeb3 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -3,8 +3,8 @@
;; Author: Christian Johansson <github.com/cjohansson>
;; Maintainer: Christian Johansson <github.com/cjohansson>
;; Created: 5 Jul 2016
-;; Modified: 15 Mar 2017
-;; Version: 1.50
+;; Modified: 24 Apr 2017
+;; Version: 1.51
;; Keywords: tools, convenience
;; URL: https://github.com/cjohansson/emacs-ssh-deploy
@@ -402,7 +402,12 @@
(progn
(if
(ediff-same-file-contents ,revision-path ,remote-path)
(list 0 (format
"Remote file '%s' has not changed." ,remote-path))
- (list 1 (format
"External file '%s' has changed, please download or diff." ,remote-path))))
+ (progn
+ (if
(ediff-same-file-contents ,path ,remote-path)
+ (progn
+ (copy-file
,path ,revision-path t t t t)
+ (list 0
(format "External file '%s' is identical to local file '%s' but different to
local revision. Updated local revision." ,remote-path ,path)))
+ (list 1 (format
"External file '%s' has changed, please download or diff." ,remote-path))))))
(list 1 "Function
ediff-same-file-contents is missing.")))
(list 0 (format "Remote file '%s'
doesn't exist." ,remote-path))))
(lambda(return)
- [elpa] externals/ssh-deploy 828aca3 022/173: Local path and local root is now evaluated based on their truenames., (continued)
- [elpa] externals/ssh-deploy 828aca3 022/173: Local path and local root is now evaluated based on their truenames., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy d40d817 027/173: Now displaying asynchrous process output., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy be5451c 019/173: Updated to comments and README, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 78d0641 031/173: Updated version and modification date., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy e94c9e7 035/173: Updated title of README.md, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 959aa79 036/173: Fixed a log message., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy f0eb826 030/173: Fixed a bug in protocol definition and started with support for multiple protocols., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 4e70a41 041/173: Now uses TRAMP via async.el for SSH transfers, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 8253251 044/173: Improved README a bit, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 94fc9e6 051/173: Updated readme, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 56da852 066/173: Fixed bug where plug-in reported external changes even though remote,
Stefan Monnier <=
- [elpa] externals/ssh-deploy a627c90 057/173: Updated readme, spelling and grammar fixes, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 0e32ab3 056/173: Added support for detection of external changes in FTP and improved async signals, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 109dbb1 034/173: FTP support and refactoring completed, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 14e7700 043/173: Now uses asynchrous tranfers progressively, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 97d803d 004/173: Updated comments and changed license in preparation for MELPA submission., Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy de8eadd 067/173: Remote path is not shell escaped on upload and download because it, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 6d1c10c 069/173: Improved documentation, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy ec46610 075/173: Fixed a typo and improved documentation, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy c8b322a 074/173: Fixed markdown syntax, Stefan Monnier, 2018/10/20
- [elpa] externals/ssh-deploy 5e86b22 072/173: Bug fix for automatically creating missing remote directories on upload, Stefan Monnier, 2018/10/20