exot/.emacs.d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: exot:df92555538ae41735c65203d2a9e0e81f8cee986
Branches Tags
exot:master
..
compare: exot:584480bd53a0efb2eefe335b2adc7395778a3221
Branches Tags
exot:master

1 Commits
df92555538 ... 584480bd53

Author SHA1 Message Date
Daniel Borchmann
584480bd53
Add state information to eshell git prompt 2022-08-29 18:59:06 +02:00
1 changed files with 8 additions and 5 deletions
Show Stats Expand all files Collapse all files

13
site-lisp/db-eshell.el
View File

@ -82,13 +82,16 @@ git repository."
(list (list
(when (file-exists-p (file-name-concat "." ".git" "MERGE_HEAD")) (when (file-exists-p (file-name-concat "." ".git" "MERGE_HEAD"))
"merge") "merge")
(unless (= 0 (call-process "git" nil nil nil (when (= 1 (call-process "git" nil nil nil
"diff" "--no-ext-diff" "--quiet")) "diff" "--no-ext-diff" "--quiet" "--exit-code"))
"dirty") "dirty")
(unless (= 0 (call-process "git" nil nil nil (when (= 1 (call-process "git" nil nil nil
"diff" "--no-ext-diff" "--quiet" "--cached")) "diff" "--no-ext-diff" "--quiet" "--exit-code" "--cached"))
"uncommitted") "uncommitted")
(unless (string-empty-p (shell-command-to-string "git stash list --quiet")) (when (with-temp-buffer
(and (= 0 (call-process "git" nil t nil
"stash" "list"))
(not (= 0 (buffer-size)))))
"stash"))))) "stash")))))
(if state-list (if state-list
(format "%s@%s[%s]" git-branch base-dir (apply #'concat (-interpose "|" state-list))) (format "%s@%s[%s]" git-branch base-dir (apply #'concat (-interpose "|" state-list)))