Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 22:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore vc-git helper function (bug#68183)

Browse source 
* lisp/vc/vc-git.el (vc-git--cmds-in-progress): Restore; it was removed
in a previous refactoring patch, but we may still find use for it.
(vc-git-dir--in-progress-headers): Use it.
This commit is contained in:
Kévin Le Gouguec 2024-08-21 08:45:00 +02:00 committed by Sean Whitton
parent 88ac5d0358
commit 53ea5f1df4
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc/vc-git.el
View file

@ -748,8 +748,8 @@ or an empty string if none."
(and tracking (fmt "Tracking" tracking))
(and remote-url (fmt "Remote" remote-url)))))))
(defun vc-git-dir--in-progress-headers ()
"Return headers for Git commands in progress in this worktree."
(defun vc-git--cmds-in-progress ()
"Return a list of Git commands in progress in this worktree."
(let ((gitdir (vc-git--git-path))
cmds)
;; See contrib/completion/git-prompt.sh in git.git.
@ -765,6 +765,11 @@ or an empty string if none."
(push 'merge cmds))
(when (file-exists-p (expand-file-name "BISECT_START" gitdir))
(push 'bisect cmds))
cmds))
(defun vc-git-dir--in-progress-headers ()
"Return headers for Git commands in progress in this worktree."
(let ((cmds (vc-git--cmds-in-progress)))
(cl-flet ((fmt (cmd name)
(when (memq cmd cmds)
;; For now just a heading, key bindings can be added