[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ztree 20b9c93 05/23: toggle show orphaned files
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ztree 20b9c93 05/23: toggle show orphaned files |
Date: |
Thu, 17 Dec 2020 23:17:02 -0500 (EST) |
branch: externals/ztree
commit 20b9c93918da01db530d1941f453cdb8437b7a7a
Author: Iurie Marian <iurie.marian@icloud.com>
Commit: Iurie Marian <iurie.marian@icloud.com>
toggle show orphaned files
---
ztree-diff.el | 52 ++++++++++++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/ztree-diff.el b/ztree-diff.el
index be30ca0..6af0bc2 100644
--- a/ztree-diff.el
+++ b/ztree-diff.el
@@ -92,6 +92,12 @@ By default paths starting with dot (like .git) are ignored")
(defvar-local ztree-diff-show-filtered-files nil
"Show or not files from the filtered list.")
+(defvar-local ztree-diff-show-right-orphan-files t
+ "Show or not orphan files/directories on right side.")
+
+(defvar-local ztree-diff-show-left-orphan-files t
+ "Show or not orphan files/directories on left side.")
+
(defvar-local ztree-diff-wait-message nil
"Message showing while constructing the diff tree.")
@@ -502,9 +508,13 @@ unless it is a parent node."
;; visible then
;; either it is a root. root have no parent
(or (not (ztree-diff-node-parent node)) ; parent is always visible
- ;; or the files are different or orphan
- (or (eql diff 'new)
- (eql diff 'diff))
+ ;; or the files are different
+ (eql diff 'diff)
+ ;; or it is orphaned, but show orphaned files for now
+ (and (eql diff 'new)
+ (if (ztree-diff-node-left-path node)
+ ztree-diff-show-left-orphan-files
+ ztree-diff-show-right-orphan-files))
;; or it is ignored but we show ignored for now
(and (eql diff 'ignore)
ztree-diff-show-filtered-files)
@@ -512,20 +522,30 @@ unless it is a parent node."
(and (eql diff 'same)
ztree-diff-show-equal-files))))
-(defun ztree-diff-toggle-show-equal-files ()
- "Toggle visibility of the equal files."
- (interactive)
- (setq ztree-diff-show-equal-files (not ztree-diff-show-equal-files))
- (message (concat (if ztree-diff-show-equal-files "Show" "Hide") " equal
files"))
- (ztree-refresh-buffer))
-
-(defun ztree-diff-toggle-show-filtered-files ()
- "Toggle visibility of the filtered files."
+(defmacro ztree-diff-define-toggle-show (what)
+ (let ((funcsymbol (intern (concat "ztree-diff-toggle-show-" what "-files")))
+ (variable (intern (concat "ztree-diff-show-" what "-files")))
+ (fundesc (concat "Toggle visibility of the " what "
files/directories")))
+ `(defun ,funcsymbol ()
+ ,fundesc
+ (interactive)
+ (setq ,variable (not ,variable))
+ (message (concat (if ,variable "Show " "Hide ") ,what " files"))
+ (ztree-refresh-buffer))))
+
+(ztree-diff-define-toggle-show "equal")
+(ztree-diff-define-toggle-show "filtered")
+(ztree-diff-define-toggle-show "left-orphan")
+(ztree-diff-define-toggle-show "right-orphan")
+
+(defun ztree-diff-toggle-show-orphan-files ()
+ "Toggle visibility of left and right orphan files."
(interactive)
- (setq ztree-diff-show-filtered-files (not ztree-diff-show-filtered-files))
- (message (concat (if ztree-diff-show-filtered-files "Show" "Hide") "
filtered files"))
- (ztree-refresh-buffer))
-
+ (let ((show (not ztree-diff-show-left-orphan-files)))
+ (setq ztree-diff-show-left-orphan-files show)
+ (setq ztree-diff-show-right-orphan-files show)
+ (message (concat (if show "Show" "Hide") " orphan files"))
+ (ztree-refresh-buffer)))
(defun ztree-diff-update-wait-message (&optional msg)
"Update the wait message MSG with one more `.' progress indication."
- [elpa] externals/ztree updated (3a4df17 -> 0a5b25f), Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 11c6e3b 02/23: Address PR feedback, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 47a6e40 03/23: Do not kill Ediff registry buffer, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 3315ecd 01/23: Address #38, #39, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree bf34366 04/23: Merge pull request #45 from xiongtx/ediff-restore, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 20b9c93 05/23: toggle show orphaned files,
Stefan Monnier <=
- [elpa] externals/ztree febc2d0 06/23: Merge pull request #46 from Iurie/master, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 0e0a39d 09/23: Issue #56: Preserve line/column position on refresh, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 67a1d90 11/23: Issue #56: Dont preserve a cursor position on widen/narrow operations, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 369fd05 10/23: Issue #50: Show file permission differences, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 00d3318 12/23: Issue #59: Position curson on the beginning of the text, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 3273e1f 13/23: Issue #60: ztree-dir change Emacs default directory, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree a3e0442 14/23: Issue #59: Place cursor at the beginning of the text, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 2f62ba7 18/23: Issue #62: Cleared warnings, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree 4879576 19/23: Issue #39: restore cursor position and window configuration, Stefan Monnier, 2020/12/17
- [elpa] externals/ztree c54425a 21/23: Updated README for issue #65., Stefan Monnier, 2020/12/17