daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2025-11-25 19:52:03 +01:00
parent 14ba373378
commit dbbae92267
280 changed files with 13451 additions and 11207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lisp/magit/magit-submodule.el
View File

@@ -158,7 +158,7 @@ and also setting this variable to t will lead to tears."
;;; Popup
;;;###autoload (autoload 'magit-submodule "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule "magit-submodule" nil t)
(transient-define-prefix magit-submodule ()
"Act on a submodule."
:man-page "git-submodule"
@@ -205,7 +205,7 @@ and also setting this variable to t will lead to tears."
(propertize "|" 'face 'transient-inactive-argument))))
(cl-call-next-method obj))))
;;;###autoload (autoload 'magit-submodule-add "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule-add "magit-submodule" nil t)
(transient-define-suffix magit-submodule-add (url &optional path name args)
"Add the repository at URL as a module.
@@ -230,7 +230,7 @@ it is nil, then PATH also becomes the name."
(file-relative-name
(read-directory-name prompt nil nil nil
(and (string-match "\\([^./]+\\)\\(\\.git\\)?$" url)
(match-string 1 url))))))
(match-str 1 url))))))
(defun magit-submodule-add-1 (url &optional path name args)
(magit-with-toplevel
@@ -262,7 +262,7 @@ it is nil, then PATH also becomes the name."
(magit-git-lines "config" "--list" "-f" ".gitmodules"))
(if prefer-short name path)))))
;;;###autoload (autoload 'magit-submodule-register "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule-register "magit-submodule" nil t)
(transient-define-suffix magit-submodule-register (modules)
"Register MODULES.
@@ -281,7 +281,7 @@ single module from the user."
(magit-with-toplevel
(magit-run-git-async "submodule" "init" "--" modules)))
;;;###autoload (autoload 'magit-submodule-populate "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule-populate "magit-submodule" nil t)
(transient-define-suffix magit-submodule-populate (modules args)
"Create MODULES working directories, checking out the recorded commits.
@@ -300,7 +300,7 @@ single module from the user."
(magit-with-toplevel
(magit-run-git-async "submodule" "update" "--init" args "--" modules)))
;;;###autoload (autoload 'magit-submodule-update "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule-update "magit-submodule" nil t)
(transient-define-suffix magit-submodule-update (modules args)
"Update MODULES by checking out the recorded commits.
@@ -323,7 +323,7 @@ single module from the user."
(magit-with-toplevel
(magit-run-git-async "submodule" "update" args "--" modules)))
;;;###autoload (autoload 'magit-submodule-synchronize "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule-synchronize "magit-submodule" nil t)
(transient-define-suffix magit-submodule-synchronize (modules args)
"Synchronize url configuration of MODULES.
@@ -339,7 +339,7 @@ single module from the user."
(magit-with-toplevel
(magit-run-git-async "submodule" "sync" args "--" modules)))
;;;###autoload (autoload 'magit-submodule-unpopulate "magit-submodule" nil t)
;;;###autoload(autoload 'magit-submodule-unpopulate "magit-submodule" nil t)
(transient-define-suffix magit-submodule-unpopulate (modules args)
"Remove working directories of MODULES.
@@ -498,13 +498,14 @@ or, failing that, the abbreviated HEAD commit hash."
(if-let ((branch (magit-get-current-branch)))
(propertize branch 'font-lock-face 'magit-branch-local)
(propertize "(detached)" 'font-lock-face 'warning))))
(if-let ((desc (magit-git-string "describe" "--tags")))
(progn (when (and magit-modules-overview-align-numbers
(string-match-p "\\`[0-9]" desc))
(insert ?\s))
(insert (propertize desc 'font-lock-face 'magit-tag)))
(when-let ((abbrev (magit-rev-format "%h")))
(insert (propertize abbrev 'font-lock-face 'magit-hash)))))
(cond-let
([desc (magit-git-string "describe" "--tags")]
(when (and magit-modules-overview-align-numbers
(string-match-p "\\`[0-9]" desc))
(insert ?\s))
(insert (propertize desc 'font-lock-face 'magit-tag)))
([abbrev (magit-rev-format "%h")]
(insert (propertize abbrev 'font-lock-face 'magit-hash)))))
(insert ?\n))))))
(insert ?\n))
@@ -587,24 +588,24 @@ These sections can be expanded to show the respective commits."
(defun magit--insert-modules-logs (heading type range)
"For internal use, don't add to a hook."
(when-let (((not (magit-ignore-submodules-p)))
(when-let ((_(not (magit-ignore-submodules-p)))
(modules (magit-list-module-paths)))
(magit-insert-section ((eval type) nil t)
(string-match "\\`\\(.+\\) \\([^ ]+\\)\\'" heading)
(magit-insert-heading
(propertize (match-string 1 heading)
(propertize (match-str 1 heading)
'font-lock-face 'magit-section-heading)
" "
(propertize (match-string 2 heading)
(propertize (match-str 2 heading)
'font-lock-face 'magit-branch-remote)
":")
(dolist (module modules)
(when-let* ((default-directory (expand-file-name module))
((file-exists-p (expand-file-name ".git")))
(_(file-exists-p (expand-file-name ".git")))
(lines (magit-git-lines "-c" "push.default=current"
"log" "--oneline" range))
(count (length lines))
((> count 0)))
(_(> count 0)))
(magit-insert-section
( module module t
:range range)
@@ -612,8 +613,8 @@ These sections can be expanded to show the respective commits."
(propertize module 'font-lock-face 'magit-diff-file-heading))
(dolist (line lines)
(string-match magit-log-module-re line)
(let ((rev (match-string 1 line))
(msg (match-string 2 line)))
(let ((rev (match-str 1 line))
(msg (match-str 2 line)))
(magit-insert-section (module-commit rev t)
(insert (propertize rev 'font-lock-face 'magit-hash) " "
(magit-log--wash-summary msg) "\n")))))))
@@ -713,4 +714,15 @@ These sections can be expanded to show the respective commits."
;;; _
(provide 'magit-submodule)
;; Local Variables:
;; read-symbol-shorthands: (
;; ("and$" . "cond-let--and$")
;; ("and>" . "cond-let--and>")
;; ("and-let" . "cond-let--and-let")
;; ("if-let" . "cond-let--if-let")
;; ("when-let" . "cond-let--when-let")
;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-submodule.el ends here