[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 364eced 76/92: Make it work over TRAMP
From: |
Alexey Veretennikov |
Subject: |
[elpa] master 364eced 76/92: Make it work over TRAMP |
Date: |
Thu, 11 Jun 2015 19:48:17 +0000 |
branch: master
commit 364eced12e60d49bfd6a84b0de5f75fb78648d4d
Author: Philippe Vaucher <address@hidden>
Commit: Philippe Vaucher <address@hidden>
Make it work over TRAMP
Fixes #7
---
ztree-diff-model.el | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index c915d90..d2dfd1f 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -105,12 +105,21 @@
(string-equal (ztree-diff-node-right-path node1)
(ztree-diff-node-right-path node1))))
+(defun ztree-diff-untrampify-filename (file)
+ "Returns `file' as the local file name."
+ (require 'tramp)
+ (if (not (tramp-tramp-file-p file))
+ file
+ (tramp-file-name-localname (tramp-dissect-file-name file))))
+
(defun ztree-diff-model-files-equal (file1 file2)
"Compare files using external diff. Returns t if equal"
- (let ((diff-output (shell-command-to-string (concat "diff -q" " " file1 " "
file2))))
+ (let* ((file1-untrampified (ztree-diff-untrampify-filename file1))
+ (file2-untrampified (ztree-diff-untrampify-filename file2))
+ (diff-command (concat "diff -q" " " file1-untrampified " "
file2-untrampified))
+ (diff-output (shell-command-to-string diff-command)))
(not (> (length diff-output) 2))))
-
(defun ztree-directory-files (dir)
"Returns the list of full paths of files in a directory, filtering out . and
.."
(ztree-filter #'(lambda (file) (let ((simple-name (file-short-name file)))
- [elpa] master c81ae1f 65/92: Merge pull request #3 from yasuyk/patch-2, (continued)
- [elpa] master c81ae1f 65/92: Merge pull request #3 from yasuyk/patch-2, Alexey Veretennikov, 2015/06/11
- [elpa] master 635eb9a 67/92: Merge pull request #4 from yasuyk/patch-3, Alexey Veretennikov, 2015/06/11
- [elpa] master b772a0c 71/92: Merge branch 'master' of github.com:fourier/ztree, Alexey Veretennikov, 2015/06/11
- [elpa] master 557024f 72/92: Merge pull request #6 from jpkotta/master, Alexey Veretennikov, 2015/06/11
- [elpa] master fa043b6 70/92: Fixed issue #5 with electric-indent-mode by turning it off, Alexey Veretennikov, 2015/06/11
- [elpa] master 4086298 68/92: add ztree-find-file as the action for ztree-dir, Alexey Veretennikov, 2015/06/11
- [elpa] master d44da81 69/92: Fixed issue #1 with electric-indent-mode by turning it off, Alexey Veretennikov, 2015/06/11
- [elpa] master 111afc6 73/92: Issue #8: Added hotkey 'x' to toggle between expanded/collapsed state of the current directory and its children, Alexey Veretennikov, 2015/06/11
- [elpa] master 2dd7c7b 75/92: Fixed vertical line for separator - now it is not rounded, Alexey Veretennikov, 2015/06/11
- [elpa] master f037979 74/92: Added rounding at the end of vertical line, Alexey Veretennikov, 2015/06/11
- [elpa] master 364eced 76/92: Make it work over TRAMP,
Alexey Veretennikov <=
- [elpa] master 32db847 78/92: Fixed files with spaces comparison error, Alexey Veretennikov, 2015/06/11
- [elpa] master cefecf1 77/92: Merge pull request #9 from Silex/master, Alexey Veretennikov, 2015/06/11
- [elpa] master 9b1f994 79/92: Fixed tree offset on the right side, Alexey Veretennikov, 2015/06/11
- [elpa] master b217776 80/92: Added reference to zdircmp, Alexey Veretennikov, 2015/06/11
- [elpa] master 7156104 81/92: Updated ztree-diff-filter-list, Alexey Veretennikov, 2015/06/11
- [elpa] master c7a05e8 83/92: Merge pull request #16 from syohex/fix-declarations, Alexey Veretennikov, 2015/06/11
- [elpa] master 39854cd 82/92: Fix variable declarations, Alexey Veretennikov, 2015/06/11
- [elpa] master 22c97ab 87/92: Updated readme with info about ELPA, Alexey Veretennikov, 2015/06/11
- [elpa] master ffd97be 89/92: Preparation for GNU ELPA, Alexey Veretennikov, 2015/06/11
- [elpa] master 1dbb290 92/92: Merge remote-tracking branch 'ztree/master', Alexey Veretennikov, 2015/06/11