update packages
This commit is contained in:
@@ -17,16 +17,17 @@
|
||||
;; Homepage: https://github.com/magit/magit
|
||||
;; Keywords: git tools vc
|
||||
|
||||
;; Package-Version: 20250711.1903
|
||||
;; Package-Revision: d8b4690900a0
|
||||
;; Package-Version: 20251125.101
|
||||
;; Package-Revision: ced3d5afc33d
|
||||
;; Package-Requires: (
|
||||
;; (emacs "27.1")
|
||||
;; (compat "30.1")
|
||||
;; (llama "1.0.0")
|
||||
;; (magit-section "4.3.8")
|
||||
;; (seq "2.24")
|
||||
;; (transient "0.9.3")
|
||||
;; (with-editor "3.4.4"))
|
||||
;; (emacs "28.1")
|
||||
;; (compat "30.1")
|
||||
;; (cond-let "0.1")
|
||||
;; (llama "1.0")
|
||||
;; (magit-section "4.4")
|
||||
;; (seq "2.24")
|
||||
;; (transient "0.10")
|
||||
;; (with-editor "3.4"))
|
||||
|
||||
;; SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
@@ -69,15 +70,10 @@
|
||||
(require 'magit-repos)
|
||||
(require 'git-commit)
|
||||
|
||||
(require 'epa) ;used in magit-read-gpg-{secret,signing}-key
|
||||
(require 'format-spec)
|
||||
(require 'package nil t) ; used in `magit-version'
|
||||
(require 'with-editor)
|
||||
|
||||
;; For `magit:--gpg-sign'
|
||||
(declare-function epg-list-keys "epg" (context &optional name mode))
|
||||
(declare-function epg-decode-dn "epg" (alist))
|
||||
(defvar epa-protocol)
|
||||
|
||||
;;; Options
|
||||
|
||||
(defcustom magit-openpgp-default-signing-key nil
|
||||
@@ -329,7 +325,7 @@ already been run."
|
||||
|
||||
;;; Dispatch Popup
|
||||
|
||||
;;;###autoload (autoload 'magit-dispatch "magit" nil t)
|
||||
;;;###autoload(autoload 'magit-dispatch "magit" nil t)
|
||||
(transient-define-prefix magit-dispatch ()
|
||||
"Invoke a Magit command from a list of available commands."
|
||||
:info-manual "(magit)Top"
|
||||
@@ -420,7 +416,7 @@ This affects `magit-git-command', `magit-git-command-topdir',
|
||||
|
||||
(defvar magit-git-command-history nil)
|
||||
|
||||
;;;###autoload (autoload 'magit-run "magit" nil t)
|
||||
;;;###autoload(autoload 'magit-run "magit" nil t)
|
||||
(transient-define-prefix magit-run ()
|
||||
"Run git or another command, or launch a graphical utility."
|
||||
[["Run git subcommand"
|
||||
@@ -524,7 +520,7 @@ is run in the top-level directory of the current working tree."
|
||||
(defun magit-read-gpg-secret-key
|
||||
(prompt &optional initial-input history predicate default)
|
||||
(require 'epa)
|
||||
(let* ((keys (mapcan
|
||||
(let* ((keys (seq-keep
|
||||
(lambda (cert)
|
||||
(and (or (not predicate)
|
||||
(funcall predicate cert))
|
||||
@@ -532,17 +528,16 @@ is run in the top-level directory of the current working tree."
|
||||
(fpr (epg-sub-key-fingerprint key))
|
||||
(id (epg-sub-key-id key))
|
||||
(author
|
||||
(and-let* ((id-obj
|
||||
(car (epg-key-user-id-list cert))))
|
||||
(and-let ((id-obj
|
||||
(car (epg-key-user-id-list cert))))
|
||||
(let ((id-str (epg-user-id-string id-obj)))
|
||||
(if (stringp id-str)
|
||||
id-str
|
||||
(epg-decode-dn id-obj))))))
|
||||
(list
|
||||
(propertize fpr 'display
|
||||
(concat (substring fpr 0 (- (length id)))
|
||||
(propertize id 'face 'highlight)
|
||||
" " author))))))
|
||||
(propertize fpr 'display
|
||||
(concat (substring fpr 0 (- (length id)))
|
||||
(propertize id 'face 'highlight)
|
||||
" " author)))))
|
||||
(epg-list-keys (epg-make-context epa-protocol) nil t)))
|
||||
(choice (or (and (not current-prefix-arg)
|
||||
(or (and (length= keys 1) (car keys))
|
||||
@@ -638,7 +633,9 @@ the output in the kill ring.
|
||||
(push t debug)
|
||||
(load-file static)
|
||||
magit-version))
|
||||
(when (featurep 'package)
|
||||
(when (and (featurep 'package)
|
||||
(boundp 'package-alist)
|
||||
(fboundp 'package-version-join))
|
||||
(push 'elpa debug)
|
||||
(ignore-errors
|
||||
(when-let ((version (cadr (assq 'magit package-alist))))
|
||||
@@ -652,7 +649,7 @@ the output in the kill ring.
|
||||
(let ((dirname (file-name-nondirectory
|
||||
(directory-file-name topdir))))
|
||||
(when (string-match "\\`magit-\\([0-9].*\\)" dirname)
|
||||
(setq magit-version (match-string 1 dirname)))))
|
||||
(setq magit-version (match-str 1 dirname)))))
|
||||
;; If all else fails, just report the commit hash. It's
|
||||
;; better than nothing and we cannot do better in the case
|
||||
;; of e.g., a shallow clone.
|
||||
@@ -667,44 +664,44 @@ the output in the kill ring.
|
||||
(magit-git-string "rev-parse" "HEAD"))))))))
|
||||
(if (stringp magit-version)
|
||||
(when print-dest
|
||||
(let ((str (format
|
||||
"Magit %s%s, Transient %s,%s Git %s, Emacs %s, %s"
|
||||
(or magit-version "(unknown)")
|
||||
(or (and (ignore-errors
|
||||
(let* ((alt (or (and (ignore-errors
|
||||
(magit--version>= magit-version "2008"))
|
||||
(ignore-errors
|
||||
(require 'lisp-mnt)
|
||||
(and (fboundp 'lm-header)
|
||||
(format
|
||||
" [>= %s]"
|
||||
(with-temp-buffer
|
||||
(insert-file-contents
|
||||
(locate-library "magit.el" t))
|
||||
(lm-header "Package-Version"))))))
|
||||
"")
|
||||
(or (ignore-errors
|
||||
(require 'lisp-mnt)
|
||||
(and (fboundp 'lm-header)
|
||||
(with-temp-buffer
|
||||
(insert-file-contents
|
||||
(locate-library "transient.el" t))
|
||||
(lm-header "Package-Version"))))
|
||||
"(unknown)")
|
||||
(let ((lib (locate-library "forge.el" t)))
|
||||
(or (and lib
|
||||
(format
|
||||
" Forge %s,"
|
||||
(or (ignore-errors
|
||||
(require 'lisp-mnt)
|
||||
(with-temp-buffer
|
||||
(insert-file-contents lib)
|
||||
(and (fboundp 'lm-header)
|
||||
(lm-header "Package-Version"))))
|
||||
"(unknown)")))
|
||||
""))
|
||||
(magit--safe-git-version)
|
||||
emacs-version
|
||||
system-type)))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents
|
||||
(locate-library "magit.el" t))
|
||||
(lm-header "Package-Version")))))))
|
||||
(str (format
|
||||
"Magit %s%s, Transient %s,%s Git %s, Emacs %s, %s"
|
||||
(or magit-version "(unknown)")
|
||||
(if (and alt (not (equal alt magit-version)))
|
||||
(format " [>= %s]" alt)
|
||||
"")
|
||||
(or (ignore-errors
|
||||
(require 'lisp-mnt)
|
||||
(and (fboundp 'lm-header)
|
||||
(with-temp-buffer
|
||||
(insert-file-contents
|
||||
(locate-library "transient.el" t))
|
||||
(lm-header "Package-Version"))))
|
||||
"(unknown)")
|
||||
(let ((lib (locate-library "forge.el" t)))
|
||||
(or (and lib
|
||||
(format
|
||||
" Forge %s,"
|
||||
(or (ignore-errors
|
||||
(require 'lisp-mnt)
|
||||
(with-temp-buffer
|
||||
(insert-file-contents lib)
|
||||
(and (fboundp 'lm-header)
|
||||
(lm-header "Package-Version"))))
|
||||
"(unknown)")))
|
||||
""))
|
||||
(magit--safe-git-version)
|
||||
emacs-version
|
||||
system-type)))
|
||||
(when interactive
|
||||
(kill-new str))
|
||||
(princ str print-dest)))
|
||||
@@ -776,7 +773,11 @@ For X11 something like ~/.xinitrc should work.\n"
|
||||
(require 'magit-stash)
|
||||
(require 'magit-blame)
|
||||
(require 'magit-submodule)
|
||||
(unless (load "magit-autoloads" t t)
|
||||
;; The `provide' form may be missing so we have to
|
||||
;; try harder to ensure this is loaded exactly once.
|
||||
(unless (or (featurep 'magit-autoloads)
|
||||
(autoloadp (symbol-function 'magit-patch))
|
||||
(load "magit-autoloads" t))
|
||||
(require 'magit-patch)
|
||||
(require 'magit-subtree)
|
||||
(require 'magit-ediff)
|
||||
@@ -797,4 +798,15 @@ For X11 something like ~/.xinitrc should work.\n"
|
||||
(add-hook 'after-init-hook #'magit-startup-asserts t)
|
||||
(add-hook 'after-init-hook #'magit-version t)))
|
||||
|
||||
;; 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.el ends here
|
||||
|
||||
Reference in New Issue
Block a user