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-02-26 20:16:44 +01:00
parent 59db017445
commit 45d49daef0
291 changed files with 16240 additions and 522600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
lisp/magit/magit.el
View File

@@ -1,10 +1,10 @@
;;; magit.el --- A Git porcelain inside Emacs -*- lexical-binding:t; coding:utf-8 -*-
;; Copyright (C) 2008-2023 The Magit Project Contributors
;; Copyright (C) 2008-2025 The Magit Project Contributors
;; Author: Marius Vollmer <marius.vollmer@gmail.com>
;; Jonas Bernoulli <jonas@bernoul.li>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
;; Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
;; Kyle Meyer <kyle@kyleam.com>
;; Former-Maintainers:
;; Nicolas Dudebout <nicolas.dudebout@gatech.edu>
@@ -17,16 +17,15 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: git tools vc
;; Package-Version: 3.3.0.50-git
;; Package-Version: 4.3.0
;; Package-Requires: (
;; (emacs "25.1")
;; (compat "29.1.3.4")
;; (dash "2.19.1")
;; (git-commit "3.3.0")
;; (magit-section "3.3.0")
;; (emacs "27.1")
;; (compat "30.0.2.0")
;; (llama "0.6.0")
;; (magit-section "4.3.0")
;; (seq "2.24")
;; (transient "0.3.6")
;; (with-editor "3.0.5"))
;; (transient "0.8.4")
;; (with-editor "3.4.3"))
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -194,7 +193,7 @@ and/or `magit-branch-remote-head'."
(defface magit-keyword-squash
'((t :inherit font-lock-warning-face))
"Face for squash! and fixup! keywords in commit messages."
"Face for squash! and similar keywords in commit messages."
:group 'magit-faces)
(defface magit-signature-good
@@ -259,20 +258,20 @@ the current Emacs session.
If the value is nil, no bindings are added.
If `default', maybe add:
If \\+`default', maybe add:
C-x g `magit-status'
C-x M-g `magit-dispatch'
C-c M-g `magit-file-dispatch'
\\`C-x' \\`g' `magit-status'
\\`C-x' \\`M-g' `magit-dispatch'
\\`C-c' \\`M-g' `magit-file-dispatch'
If `recommended', maybe add:
C-x g `magit-status'
C-c g `magit-dispatch'
C-c f `magit-file-dispatch'
\\`C-x' \\`g' `magit-status'
\\`C-c' \\`g' `magit-dispatch'
\\`C-c' \\`f' `magit-file-dispatch'
These bindings are strongly recommended, but we cannot use
them by default, because the \"C-c <LETTER>\" namespace is
them by default, because the \\`C-c <LETTER>' namespace is
strictly reserved for bindings added by the user.
The bindings in the chosen set may be added when
@@ -440,7 +439,7 @@ This affects `magit-git-command', `magit-git-command-topdir',
(defun magit-git-command (command)
"Execute COMMAND asynchronously; display output.
Interactively, prompt for COMMAND in the minibuffer. \"git \" is
Interactively, prompt for COMMAND in the minibuffer. \"git \" is
used as initial input, but can be deleted to run another command.
With a prefix argument COMMAND is run in the top-level directory
@@ -452,7 +451,7 @@ of the current working tree, otherwise in `default-directory'."
(defun magit-git-command-topdir (command)
"Execute COMMAND asynchronously; display output.
Interactively, prompt for COMMAND in the minibuffer. \"git \" is
Interactively, prompt for COMMAND in the minibuffer. \"git \" is
used as initial input, but can be deleted to run another command.
COMMAND is run in the top-level directory of the current
@@ -482,9 +481,10 @@ is run in the top-level directory of the current working tree."
(defun magit--shell-command (command &optional directory)
(let ((default-directory (or directory default-directory)))
(with-environment-variables (("GIT_PAGER" "cat"))
(magit--with-connection-local-variables
(magit-start-process shell-file-name nil
shell-command-switch command))))
(with-connection-local-variables
(magit-with-editor
(magit-start-process shell-file-name nil
shell-command-switch command)))))
(magit-process-buffer))
(defun magit-read-shell-command (&optional toplevel initial-input)
@@ -501,20 +501,29 @@ is run in the top-level directory of the current working tree."
;;; Shared Infix Arguments
(transient-define-argument magit:--signoff ()
:description "Add Signed-off-by trailer"
:class 'transient-switch
:key "+s"
:shortarg "-s"
:argument "--signoff"
:level 6)
(transient-define-argument magit:--gpg-sign ()
:description "Sign using gpg"
:class 'transient-option
:shortarg "-S"
:argument "--gpg-sign="
:allow-empty t
:reader #'magit-read-gpg-signing-key)
:reader #'magit-read-gpg-signing-key
:level 5)
(defvar magit-gpg-secret-key-hist nil)
(defun magit-read-gpg-secret-key
(prompt &optional initial-input history predicate default)
(require 'epa)
(let* ((keys (cl-mapcan
(let* ((keys (mapcan
(lambda (cert)
(and (or (not predicate)
(funcall predicate cert))
@@ -561,6 +570,7 @@ is run in the top-level directory of the current working tree."
(1 'font-lock-keyword-face)
(2 'font-lock-function-name-face nil t))
(,(concat "(" (regexp-opt '("magit-insert-section"
"magit-insert-heading"
"magit-section-case"
"magit-bind-match-strings"
"magit-with-temp-index"
@@ -579,7 +589,7 @@ is run in the top-level directory of the current working tree."
Use the function by the same name instead of this variable.")
;;;###autoload
(defun magit-version (&optional print-dest interactive)
(defun magit-version (&optional print-dest interactive nowarn)
"Return the version of Magit currently in use.
If optional argument PRINT-DEST is non-nil, also print the used
@@ -597,7 +607,7 @@ the output in the kill ring.
'("magit.el" "magit.el.gz")))
(let ((load-suffixes (reverse load-suffixes))) ; prefer .el than .elc
(setq toplib (locate-library "magit"))))
(setq toplib (and toplib (magit--straight-chase-links toplib)))
(setq toplib (and toplib (magit--chase-links toplib)))
(push toplib debug)
(when toplib
(let* ((topdir (file-name-directory toplib))
@@ -605,7 +615,7 @@ the output in the kill ring.
".git" (file-name-directory
(directory-file-name topdir))))
(static (locate-library "magit-version.el" nil (list topdir)))
(static (and static (magit--straight-chase-links static))))
(static (and static (magit--chase-links static))))
(or (progn
(push 'repo debug)
(when (and (file-exists-p gitdir)
@@ -657,7 +667,7 @@ the output in the kill ring.
(if (stringp magit-version)
(when print-dest
(let ((str (format
"Magit %s%s, Transient %s, Git %s, Emacs %s, %s"
"Magit %s%s, Transient %s,%s Git %s, Emacs %s, %s"
(or magit-version "(unknown)")
(or (and (ignore-errors
(magit--version>= magit-version "2008"))
@@ -679,6 +689,18 @@ the output in the kill ring.
(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)))
@@ -689,8 +711,7 @@ the output in the kill ring.
(setq magit-version 'error)
(when magit-version
(push magit-version debug))
(unless (equal (getenv "CI") "true")
;; The repository is a sparse clone.
(unless (or nowarn (equal (getenv "CI") "true"))
(message "Cannot determine Magit's version %S" debug)))
magit-version))
@@ -770,7 +791,7 @@ For X11 something like ~/.xinitrc should work.\n"
(unless (bound-and-true-p byte-compile-current-file)
(if after-init-time
(progn (magit-startup-asserts)
(magit-version))
(magit-version nil nil t))
(add-hook 'after-init-hook #'magit-startup-asserts t)
(add-hook 'after-init-hook #'magit-version t)))