bth/minmo
Watch
1
Fork
You've already forked minmo
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minmo : cache branch

Browse source
This commit is contained in:
bth 2026-05-27 12:27:24 -07:00
commit 03d3687404
1 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
packages/minmo.el
View file

@ -60,11 +60,20 @@ filesystem FSTYPE, 'git or 'disk."
"Utility predicate to prevent expensive VC checks remotely." "Utility predicate to prevent expensive VC checks remotely."
(and buffer-file-name (not (file-remote-p (buffer-file-name))))) (and buffer-file-name (not (file-remote-p (buffer-file-name)))))
(defun minmo-branch (file) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(or (vc-git--symbolic-ref file) ;;;; branch
(defvar-local minmo--vc-branch-cache nil
"Cached mode-line string for git branch.")
(defun minmo--fetch-vc-branch (file)
"Get the branch from vc state cache if available, otherwise call git."
(concat " :" (or (vc-git--symbolic-ref file)
;; first 7 of commit hash: ;; first 7 of commit hash:
(substring (vc-git-working-revision file) 0 7) (substring (vc-git-working-revision file) 0 7)
"?")) "?")))
(defun minmo-branch () minmo--vc-branch-cache)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; tracked files ;;;; tracked files
@ -77,18 +86,17 @@ filesystem FSTYPE, 'git or 'disk."
(defun minmo--vc-tracked-status-override (file) (defun minmo--vc-tracked-status-override (file)
"Replace the default `vc-git-mode-line-string' builder. "Replace the default `vc-git-mode-line-string' builder.
Uses the fast `vc-state' cache rather than synchronous git calls." Uses the fast `vc-state' cache rather than synchronous git calls."
(let* ((state (vc-state file)) (let* ((state (vc-state file)))
(branch (minmo-branch file))) (setq minmo--vc-branch-cache (minmo--fetch-vc-branch file))
(setq minmo--vc-tracked-cache (setq minmo--vc-tracked-cache
(pcase state (pcase state
;; NOTE: vc-mode adds its own space prefix to vc-git-mode-line-string: ;; NOTE: vc-mode adds its own space prefix to vc-git-mode-line-string:
('up-to-date (concat ":" branch " " (minmo--status 'unmodified 'git))) ('up-to-date (minmo--status 'unmodified 'git))
('edited (concat ":" branch " " (minmo--status 'modified/staged 'git))) ('edited (minmo--status 'modified/staged 'git))
('added (concat ":" branch " " (minmo--status 'new 'git))) ('added (minmo--status 'new 'git))
('needs-merge (concat ":" branch " " (minmo--status 'modified/staged 'git))) ('needs-merge (minmo--status 'modified/staged 'git))
('conflict (concat ":" branch " " (minmo--status 'modified/staged 'git))) ('conflict (minmo--status 'modified/staged 'git))
(_ (concat ":" branch " " (minmo--status 'unmodified 'git))) (_ (minmo--status 'unmodified 'git))
)))) ))))
;; NOTE: :override replaces the function ;; NOTE: :override replaces the function
@ -118,7 +126,7 @@ Uses the fast `vc-state' cache rather than synchronous git calls."
;; vc-git-state directly queries git ;; vc-git-state directly queries git
(let ((state (vc-git-state buffer-file-name)) (let ((state (vc-git-state buffer-file-name))
(branch (minmo-branch buffer-file-name))) (branch (minmo--fetch-vc-branch buffer-file-name)))
(setq minmo--vc-untracked-cache (setq minmo--vc-untracked-cache
(pcase state (pcase state
;; NOTE: we need the space prefix to match the output of vc-mode: ;; NOTE: we need the space prefix to match the output of vc-mode:
@ -305,6 +313,7 @@ Updates only on file load and save to guarantee zero redisplay lag.")
;;;;;;;;;;;;; ;;;;;;;;;;;;;
;; status ;; status
'(:eval (minmo-branch))
'(:eval (minmo-vc-status)) '(:eval (minmo-vc-status))
'(:eval (minmo-disk-status)) '(:eval (minmo-disk-status))