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

minmo : strip out project-current, use minmo--find-git

Browse source
This commit is contained in:
bth 2026-06-03 00:28:15 -07:00
commit 29157bfd7a
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
packages/minmo.el
View file

@ -12,6 +12,16 @@
;; line:col ;; line:col
;; lines ;; lines
;; NOTE: this has been cleansed of vc-mode dependencies, despite the fact that
;; it might seem better practice to use builtin libraries. But `vc' tries much
;; too hard to be compatible with obsolete version control systems no one uses,
;; and as a result limits its functionality and performance. We all use git, so
;; just consolidate.
;;
;; Unforunately the `project' code uses the same code under the hood, so this
;; has also been stripped out in favor of just storing the directory containing
;; the ".git" folder, which we're checking for anyway.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; buffer-name ;;; buffer-name
@ -107,15 +117,15 @@ single space.")
(defvar minmo--git-directory-table (make-hash-table) "Store known directories (defvar minmo--git-directory-table (make-hash-table) "Store known directories
with .git") with .git")
(defun minmo--under-git-p (file &optional force) (defun minmo--find-git (file &optional force)
"Walk up the directory tree looking for `.git'. Returns t or nil. "Walk up the directory tree looking for `.git'. Returns the path or nil.
Optional FORCE means ignore the minmo--git-directory-table." Optional FORCE means ignore the minmo--git-directory-table."
(let* ((dir (file-name-directory file)) (let* ((dir (file-name-directory file))
(hash (gethash dir minmo--git-directory-table))) (hash (gethash dir minmo--git-directory-table)))
(if (or force (not hash)) (if (or force (not hash))
;; NOTE: store 'ignore for files not under .git ;; NOTE: store 'ignore for files not under .git
(puthash dir (or (locate-dominating-file file ".git") 'ignore) minmo--git-directory-table) (puthash dir (or (locate-dominating-file file ".git") 'ignore) minmo--git-directory-table)
(not (eq hash 'ignore))))) (if (eq hash 'ignore) nil hash))))
(defun minmo--file-exists-locally-p () (defun minmo--file-exists-locally-p ()
"Utility predicate to prevent expensive VC checks remotely." "Utility predicate to prevent expensive VC checks remotely."
@ -151,7 +161,7 @@ Optional FORCE means ignore the minmo--git-directory-table."
(when (minmo--file-exists-locally-p) (when (minmo--file-exists-locally-p)
(let ((old-status minmo--vc-status-cache) (let ((old-status minmo--vc-status-cache)
(old-branch minmo--vc-branch-cache) (old-branch minmo--vc-branch-cache)
(git (minmo--under-git-p buffer-file-name force))) (git (minmo--find-git buffer-file-name force)))
(if git (if git
(progn (progn
@ -237,9 +247,6 @@ Optional FORCE means ignore the minmo--git-directory-table."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; project ;;; project
;; project-current has caching, but this extends it further: get the
;; project-name once when the file is opened.
;; running up directories looking for .git can be bad.
(defvar-local minmo--project-cache nil) (defvar-local minmo--project-cache nil)
(defun minmo--cache-project () (defun minmo--cache-project ()
@ -247,16 +254,11 @@ Optional FORCE means ignore the minmo--git-directory-table."
(setq minmo--project-cache (setq minmo--project-cache
;; don't show project for help buffers, remote files, etc: ;; don't show project for help buffers, remote files, etc:
(when-let* ((_ (minmo--file-exists-locally-p)) (when-let* ((_ (minmo--file-exists-locally-p))
;; NOTE: taken from project-mode-line-format ;; NOTE: don't rely on project-current anymore, since it
(last-coding-system-used last-coding-system-used) ;; actually uses the same old vc-mode logic I wanted to
;; NOTE: project-current calls project--get-cached, which uses ;; avoid.
;; project-vc-non-essential-cache-timeout when non-essential is t (git (minmo--find-git buffer-file-name)))
(non-essential t) (concat " " (file-name-nondirectory (directory-file-name git))))
;; TODO: this relies on vc internals. if I'm severing
;; dependence on vc-mode, consider replacing with a simple
;; dir lookup done during minmo--under-git-p
(project (project-current)))
(concat " " (project-name project)))
)) ))
(defun minmo-project () minmo--project-cache) (defun minmo-project () minmo--project-cache)