[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 44743c1 37/92: Added progress indication to the diff model
From: |
Alexey Veretennikov |
Subject: |
[elpa] master 44743c1 37/92: Added progress indication to the diff model |
Date: |
Thu, 11 Jun 2015 19:48:01 +0000 |
branch: master
commit 44743c1efc17f4fa15c3f547c5c87e7cd455d3b9
Author: Alexey Veretennikov <address@hidden>
Commit: Alexey Veretennikov <address@hidden>
Added progress indication to the diff model
---
ztree-diff-model.el | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index 4d79ac9..67b11ba 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -2,6 +2,16 @@
(require 'ztree-util)
+(defvar ztree-diff-model-wait-message nil
+ "Message showing while constructing the diff tree")
+(make-variable-buffer-local 'ztree-diff-model-wait-message)
+
+
+(defun ztree-diff-model-update-wait-message ()
+ (when ztree-diff-model-wait-message
+ (setq ztree-diff-model-wait-message (concat ztree-diff-model-wait-message
"."))
+ (message ztree-diff-model-wait-message)))
+
;; different = {nil, 'new, 'diff}
(defun ztree-diff-model-create-node (left-full-path right-full-path short-name
children different)
(let (node)
@@ -105,6 +115,7 @@ the rest is the combined list of nodes"
(list2 (ztree-directory-files path2))
(different-dir nil)
(result nil))
+ (ztree-diff-model-update-wait-message)
;; first - adding all entries from left directory
(dolist (file1 list1)
;; for every entry in the first directory
@@ -176,7 +187,7 @@ the rest is the combined list of nodes"
(error "Path %s is not a directory" dir1))
(when (not (file-directory-p dir2))
(error "Path %s is not a directory" dir2))
- (message (concat "Comparing " dir1 " and " dir2 " ..."))
+ (setq ztree-diff-model-wait-message (concat "Comparing " dir1 " and " dir2 "
..."))
(let* ((model
(ztree-diff-model-create-node dir1 dir2
(concat (file-short-name dir1)
- [elpa] master 2f888c5 26/92: Added util file, (continued)
- [elpa] master 2f888c5 26/92: Added util file, Alexey Veretennikov, 2015/06/11
- [elpa] master 41ab149 29/92: Added sorting to the tree, Alexey Veretennikov, 2015/06/11
- [elpa] master d0e255e 20/92: Implemented difftree model, Alexey Veretennikov, 2015/06/11
- [elpa] master a39e8c6 24/92: Started preparation for 2 column tree, Alexey Veretennikov, 2015/06/11
- [elpa] master 3260487 25/92: Preparing for the double tree drawing, Alexey Veretennikov, 2015/06/11
- [elpa] master 8685235 27/92: Added support for 2 trees, Alexey Veretennikov, 2015/06/11
- [elpa] master 28fa370 33/92: Reimplemented search for node by line using hash table, Alexey Veretennikov, 2015/06/11
- [elpa] master 413cff4 30/92: Drawing trees only to visible items, Alexey Veretennikov, 2015/06/11
- [elpa] master 161b1b3 35/92: Added messages, Alexey Veretennikov, 2015/06/11
- [elpa] master 9b91d44 31/92: Implemented colors support for different files, Alexey Veretennikov, 2015/06/11
- [elpa] master 44743c1 37/92: Added progress indication to the diff model,
Alexey Veretennikov <=
- [elpa] master 99a0cf7 36/92: Started work for identifying parents in nodes, Alexey Veretennikov, 2015/06/11
- [elpa] master 291a115 32/92: Header is now customizable, Alexey Veretennikov, 2015/06/11
- [elpa] master f9620df 34/92: Added action on modified files, Alexey Veretennikov, 2015/06/11
- [elpa] master 900c8fa 38/92: Refactored using defrecord macro, Alexey Veretennikov, 2015/06/11
- [elpa] master 6154ab8 21/92: Split view and models - for directory tree and for diff tree, Alexey Veretennikov, 2015/06/11
- [elpa] master 8335785 39/92: Added comment, Alexey Veretennikov, 2015/06/11
- [elpa] master 1ab3b48 43/92: Implemented file copying, Alexey Veretennikov, 2015/06/11
- [elpa] master af28a78 41/92: Started implementation of the copy functionality, Alexey Veretennikov, 2015/06/11
- [elpa] master 75b89a6 48/92: Fixed typo, Alexey Veretennikov, 2015/06/11
- [elpa] master 725f388 42/92: Preparation to copy implementation done, Alexey Veretennikov, 2015/06/11