oreodave/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for detached head in git repos for eshell-prompt

Browse Source
This commit is contained in:
Aryadev Chavali
2025-05-28 00:42:43 +01:00
parent ba42346407
commit 071c77936f
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Emacs/.config/emacs/elisp/eshell-prompt.el
View File

@@ -79,18 +79,28 @@ number of files affected are returned in red."
'font-lock-face 'font-lock-face
`(:foreground ,+eshell-prompt/failure-colour))))) `(:foreground ,+eshell-prompt/failure-colour)))))
(defun +eshell-prompt/--git-branch-name ()
(let* ((branch-name (thread-last
(split-string (shell-command-to-string "git branch") "\n")
(cl-remove-if (lambda (s) (= (length s) 0)))
(cl-find-if (lambda (s) (string= "*" (substring s 0 1))))))
(branch-name (if (null branch-name) nil
(substring branch-name 2))))
(cond
((null branch-name) nil)
((string= "(" (substring branch-name 0 1))
(replace-regexp-in-string "\\(.*at \\)\\|)" "" branch-name))
(t branch-name))))
(defun +eshell-prompt/--git-status () (defun +eshell-prompt/--git-status ()
"Returns a completely formatted string of "Returns a completely formatted string of
form (BRANCH-NAME<CHANGES>[REMOTE-STATUS])." form (BRANCH-NAME<CHANGES>[REMOTE-STATUS])."
(let ((git-branch (thread-last (let ((git-branch (+eshell-prompt/--git-branch-name)))
(split-string (shell-command-to-string "git branch") "\n")
(cl-remove-if (lambda (s) (= (length s) 0)))
(cl-find-if (lambda (s) (string= "*" (substring s 0 1)))))))
(if (null git-branch) (if (null git-branch)
"" ""
(format (format
"(%s<%s>[%s])" "(%s<%s>[%s])"
(nth 2 (split-string git-branch "\n\\|\\*\\| ")) git-branch
(+eshell-prompt/--git-change-status) (+eshell-prompt/--git-change-status)
(+eshell-prompt/--git-remote-status))))) (+eshell-prompt/--git-remote-status)))))