daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2022-01-04 21:35:17 +01:00
parent 1d5275c946
commit 8de00e5202
700 changed files with 42441 additions and 85378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/treemacs-magit.el
View File

@@ -1,11 +1,11 @@
;;; treemacs-magit.el --- Magit integration for treemacs -*- lexical-binding: t -*-
;; Copyright (C) 2020 Alexander Miller
;; Copyright (C) 2021 Alexander Miller
;; Author: Alexander Miller <alexanderm@web.de>
;; Package-Requires: ((emacs "25.2") (treemacs "0.0") (pfuture "1.3" ) (magit "2.90.0"))
;; Package-Version: 20201025.957
;; Package-Commit: 6b045fd585421ab3c9e1185c2508d34af700490b
;; Package-Requires: ((emacs "26.1") (treemacs "0.0") (pfuture "1.3" ) (magit "2.90.0"))
;; Package-Version: 20211010.1005
;; Package-Commit: deb7f2cd9eb06960798edd7393df2602902ed071
;; Version: 0
;; Homepage: https://github.com/Alexander-Miller/treemacs
@@ -52,14 +52,14 @@ In order for the update to fully run several conditions must be met:
* The directory must be part of a treemacs workspace, and
* The project must not be set for refresh already."
(when treemacs-git-mode
(let ((magit-root (treemacs--canonical-path (magit-toplevel))))
(let ((magit-root (treemacs-canonical-path (magit-toplevel))))
(unless (member magit-root treemacs-magit--timers)
(push magit-root treemacs-magit--timers)
(run-with-idle-timer
3 nil
(lambda ()
(unwind-protect
(pcase treemacs-git-mode
(pcase treemacs--git-mode
('simple
(treemacs-magit--simple-git-mode-update magit-root))
((or 'extended 'deferred)
@@ -71,15 +71,11 @@ In order for the update to fully run several conditions must be met:
Without the parsing ability of extended git-mode this update uses
filewatch-mode's mechanics to update the entire project."
(treemacs-run-in-every-buffer
(when-let* ((project (treemacs--find-project-for-path magit-root)))
(let* ((project-root (treemacs-project->path project))
(dom-node (treemacs-find-in-dom project-root)))
(when (and dom-node
(null (treemacs-dom-node->refresh-flag dom-node)))
;; adding a number of change events is the easiest way to cause a full directory
;; refresh without touching treemacs proper
(dotimes (_ 8)
(treemacs--set-refresh-flags project-root 'magit-refresh project-root)))))))
(when-let* ((project (treemacs--find-project-for-path magit-root))
(dom-node (treemacs-find-in-dom (treemacs-project->path project))))
(push (cons (treemacs-project->path project) 'force-refresh)
(treemacs-dom-node->refresh-flag dom-node))
(treemacs--start-filewatch-timer))))
(defun treemacs-magit--extended-git-mode-update (magit-root)
"Update the project at the given MAGIT-ROOT.
@@ -134,7 +130,8 @@ Will update nodes under MAGIT-ROOT with output in PFUTURE-BUFFER."
(path (-some-> node (treemacs-button-get :key))))
(treemacs-with-writable-buffer
(while (and node
(file-exists-p path)
(or (not (stringp path))
(file-exists-p path))
(>= curr-depth start-depth))
(put-text-property (treemacs-button-start node) (treemacs-button-end node) 'face
(treemacs--get-node-face