From c6121a4d0c668b72fa548f1f172fff2bf8405b7d Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 25 Nov 2023 11:34:58 +0100 Subject: [PATCH] update git Signed-off-by: Andreas Gerler --- .../git-commit-autoloads.el | 0 .../git-commit-pkg.el | 10 +- .../git-commit.el | 152 ++++++++---------- elpa/git-link-20230420.48/git-link-pkg.el | 2 - .../git-link-autoloads.el | 4 + elpa/git-link-20230518.204/git-link-pkg.el | 14 ++ .../git-link.el | 11 +- .../git-timemachine-pkg.el | 2 - .../git-timemachine-autoloads.el | 4 + .../git-timemachine-pkg.el | 15 ++ .../git-timemachine.el | 8 +- 11 files changed, 121 insertions(+), 101 deletions(-) rename elpa/{git-commit-20230103.2224 => git-commit-20230521.2344}/git-commit-autoloads.el (100%) rename elpa/{git-commit-20230103.2224 => git-commit-20230521.2344}/git-commit-pkg.el (66%) rename elpa/{git-commit-20230103.2224 => git-commit-20230521.2344}/git-commit.el (92%) delete mode 100644 elpa/git-link-20230420.48/git-link-pkg.el rename elpa/{git-link-20230420.48 => git-link-20230518.204}/git-link-autoloads.el (96%) create mode 100644 elpa/git-link-20230518.204/git-link-pkg.el rename elpa/{git-link-20230420.48 => git-link-20230518.204}/git-link.el (99%) delete mode 100644 elpa/git-timemachine-20230413.620/git-timemachine-pkg.el rename elpa/{git-timemachine-20230413.620 => git-timemachine-20230630.1214}/git-timemachine-autoloads.el (92%) create mode 100644 elpa/git-timemachine-20230630.1214/git-timemachine-pkg.el rename elpa/{git-timemachine-20230413.620 => git-timemachine-20230630.1214}/git-timemachine.el (98%) mode change 100644 => 100755 diff --git a/elpa/git-commit-20230103.2224/git-commit-autoloads.el b/elpa/git-commit-20230521.2344/git-commit-autoloads.el similarity index 100% rename from elpa/git-commit-20230103.2224/git-commit-autoloads.el rename to elpa/git-commit-20230521.2344/git-commit-autoloads.el diff --git a/elpa/git-commit-20230103.2224/git-commit-pkg.el b/elpa/git-commit-20230521.2344/git-commit-pkg.el similarity index 66% rename from elpa/git-commit-20230103.2224/git-commit-pkg.el rename to elpa/git-commit-20230521.2344/git-commit-pkg.el index 51fa86db..fa74ef07 100644 --- a/elpa/git-commit-20230103.2224/git-commit-pkg.el +++ b/elpa/git-commit-20230521.2344/git-commit-pkg.el @@ -1,9 +1,9 @@ -(define-package "git-commit" "20230103.2224" "Edit Git commit messages." +(define-package "git-commit" "20230521.2344" "Edit Git commit messages." '((emacs "25.1") - (compat "28.1.1.2") - (transient "20210920") - (with-editor "20211001")) - :commit "f47b68929f01a1b8299f3160b0ab02d69d59fcb7" :authors + (compat "29.1.3.4") + (transient "20230201") + (with-editor "20230118")) + :commit "d81db78a0611d21048c1e2ff069a83f964092f10" :authors '(("Jonas Bernoulli" . "jonas@bernoul.li") ("Sebastian Wiesner" . "lunaryorn@gmail.com") ("Florian Ragwitz" . "rafl@debian.org") diff --git a/elpa/git-commit-20230103.2224/git-commit.el b/elpa/git-commit-20230521.2344/git-commit.el similarity index 92% rename from elpa/git-commit-20230103.2224/git-commit.el rename to elpa/git-commit-20230521.2344/git-commit.el index 2c90a6f4..a22a3e78 100644 --- a/elpa/git-commit-20230103.2224/git-commit.el +++ b/elpa/git-commit-20230521.2344/git-commit.el @@ -14,7 +14,7 @@ ;; Package-Version: 3.3.0.50-git ;; Package-Requires: ( ;; (emacs "25.1") -;; (compat "28.1.1.2") +;; (compat "29.1.3.4") ;; (transient "0.3.6") ;; (with-editor "3.0.5")) @@ -45,7 +45,7 @@ ;; actually passing it a message. Git then invokes the `$GIT_EDITOR' ;; (or if that is undefined `$EDITOR') asking the user to provide the ;; message by editing the file ".git/COMMIT_EDITMSG" (or another file -;; in that directory, e.g. ".git/MERGE_MSG" for merge commits). +;; in that directory, e.g., ".git/MERGE_MSG" for merge commits). ;; When `global-git-commit-mode' is enabled, which it is by default, ;; then opening such a file causes the features described below, to @@ -76,7 +76,7 @@ ;; Aborting the commit does not cause the message to be lost, but ;; relying solely on the file not being tampered with is risky. This ;; package additionally stores all aborted messages for the duration -;; of the current session (i.e. until you close Emacs). To get back +;; of the current session (i.e., until you close Emacs). To get back ;; an aborted message use M-p and M-n while editing a message. ;; ;; M-p Replace the buffer contents with the previous message @@ -117,9 +117,8 @@ ;;; Code: -(require 'seq) +(require 'compat) (require 'subr-x) - (require 'log-edit) (require 'ring) (require 'rx) @@ -128,15 +127,15 @@ (require 'with-editor) ;; For historic reasons Magit isn't a hard dependency. -(unless (and (require 'magit-base nil t) - (require 'magit-git nil t)) - (declare-function magit-completing-read "magit-base" - ( prompt collection &optional predicate require-match - initial-input hist def fallback)) - (declare-function magit-expand-git-file-name "magit-git" (filename)) - (declare-function magit-git-lines "magit-git" (&rest args)) - (declare-function magit-hook-custom-get "magit-base" (symbol)) - (declare-function magit-list-local-branch-names "magit-git" ())) +(require 'magit-base nil t) +(require 'magit-git nil t) +(declare-function magit-completing-read "magit-base" + ( prompt collection &optional predicate require-match + initial-input hist def fallback)) +(declare-function magit-expand-git-file-name "magit-git" (filename)) +(declare-function magit-git-lines "magit-git" (&rest args)) +(declare-function magit-hook-custom-get "magit-base" (symbol)) +(declare-function magit-list-local-branch-names "magit-git" ()) (defvar diff-default-read-only) (defvar flyspell-generic-check-word-predicate) @@ -205,8 +204,7 @@ The major mode configured here is turned on by the minor mode git-commit-setup-changelog-support git-commit-turn-on-auto-fill git-commit-propertize-diff - bug-reference-mode - with-editor-usage-message) + bug-reference-mode) "Hook run at the end of `git-commit-setup'." :group 'git-commit :type 'hook @@ -218,8 +216,7 @@ The major mode configured here is turned on by the minor mode git-commit-turn-on-orglink git-commit-turn-on-flyspell git-commit-propertize-diff - bug-reference-mode - with-editor-usage-message)) + bug-reference-mode)) (defcustom git-commit-post-finish-hook nil "Hook run after the user finished writing a commit message. @@ -291,25 +288,6 @@ to consider doing so." :safe 'numberp :type 'number) -(defcustom git-commit-fill-column nil - "Override `fill-column' in commit message buffers. - -If this is non-nil, then it should be an integer. If that is the -case and the buffer-local value of `fill-column' is not already -set by the time `git-commit-turn-on-auto-fill' is called as a -member of `git-commit-setup-hook', then that function sets the -buffer-local value of `fill-column' to the value of this option. - -This option exists mostly for historic reasons. If you are not -already using it, then you probably shouldn't start doing so." - :group 'git-commit - :safe 'numberp - :type '(choice (const :tag "use regular fill-column") - number)) - -(make-obsolete-variable 'git-commit-fill-column 'fill-column - "Magit 2.11.0" 'set) - (defcustom git-commit-known-pseudo-headers '("Signed-off-by" "Acked-by" "Modified-by" "Cc" "Suggested-by" "Reported-by" "Tested-by" "Reviewed-by" @@ -358,9 +336,6 @@ no effect." In this context a \"keyword\" is text surrounded by brackets." :group 'git-commit-faces) -(define-obsolete-face-alias 'git-commit-note - 'git-commit-keyword "Git-Commit 3.0.0") - (defface git-commit-pseudo-header '((t :inherit font-lock-string-face)) "Face used for pseudo headers in commit messages." @@ -378,9 +353,6 @@ In this context a \"keyword\" is text surrounded by brackets." "Face used for names of local branches in commit message comments." :group 'git-commit-faces) -(define-obsolete-face-alias 'git-commit-comment-branch - 'git-commit-comment-branch-local "Git-Commit 2.12.0") - (defface git-commit-comment-branch-remote (if (featurep 'magit) '((t :inherit magit-branch-remote)) @@ -411,24 +383,22 @@ This is only used if Magit is available." ;;; Keymap -(defvar git-commit-mode-map - (let ((map (make-sparse-keymap))) - (define-key map (kbd "M-p") #'git-commit-prev-message) - (define-key map (kbd "M-n") #'git-commit-next-message) - (define-key map (kbd "C-c M-p") #'git-commit-search-message-backward) - (define-key map (kbd "C-c M-n") #'git-commit-search-message-forward) - (define-key map (kbd "C-c C-i") #'git-commit-insert-pseudo-header) - (define-key map (kbd "C-c C-a") #'git-commit-ack) - (define-key map (kbd "C-c M-i") #'git-commit-suggested) - (define-key map (kbd "C-c C-m") #'git-commit-modified) - (define-key map (kbd "C-c C-o") #'git-commit-cc) - (define-key map (kbd "C-c C-p") #'git-commit-reported) - (define-key map (kbd "C-c C-r") #'git-commit-review) - (define-key map (kbd "C-c C-s") #'git-commit-signoff) - (define-key map (kbd "C-c C-t") #'git-commit-test) - (define-key map (kbd "C-c M-s") #'git-commit-save-message) - map) - "Key map used by `git-commit-mode'.") +(defvar-keymap git-commit-mode-map + :doc "Key map used by `git-commit-mode'." + "M-p" #'git-commit-prev-message + "M-n" #'git-commit-next-message + "C-c M-p" #'git-commit-search-message-backward + "C-c M-n" #'git-commit-search-message-forward + "C-c C-i" #'git-commit-insert-pseudo-header + "C-c C-a" #'git-commit-ack + "C-c M-i" #'git-commit-suggested + "C-c C-m" #'git-commit-modified + "C-c C-o" #'git-commit-cc + "C-c C-p" #'git-commit-reported + "C-c C-r" #'git-commit-review + "C-c C-s" #'git-commit-signoff + "C-c C-t" #'git-commit-test + "C-c M-s" #'git-commit-save-message) ;;; Menu @@ -518,29 +488,35 @@ This is only used if Magit is available." (when (eq system-type 'windows-nt) (add-hook 'find-file-not-found-functions #'git-commit-file-not-found)) -(defconst git-commit-usage-message "\ +(defconst git-commit-default-usage-message "\ Type \\[with-editor-finish] to finish, \ \\[with-editor-cancel] to cancel, and \ \\[git-commit-prev-message] and \\[git-commit-next-message] \ to recover older messages") +(defvar git-commit-usage-message git-commit-default-usage-message + "Message displayed when editing a commit message. +When this is nil, then `with-editor-usage-message' is displayed +instead. One of these messages has to be displayed; otherwise +the user gets to see the message displayed by `server-execute'. +That message is misleading and because we cannot prevent it from +being displayed, we have to immediately show another message to +prevent the user from seeing it.") + +(defvar git-commit-header-line-format nil + "If non-nil, header line format used by `git-commit-mode'. +Used as the local value of `header-line-format', in buffer using +`git-commit-mode'. If it is a string, then it is passed through +`substitute-command-keys' first. A useful setting may be: + (setq git-commit-header-line-format git-commit-default-usage-message) + (setq git-commit-usage-message nil) ; show a shorter message") + (defun git-commit-setup () (when (fboundp 'magit-toplevel) ;; `magit-toplevel' is autoloaded and defined in magit-git.el, ;; That library declares this functions without loading ;; magit-process.el, which defines it. (require 'magit-process nil t)) - (when git-commit-major-mode - (let ((auto-mode-alist (list (cons (concat "\\`" - (regexp-quote buffer-file-name) - "\\'") - git-commit-major-mode))) - ;; The major-mode hook might want to consult these minor - ;; modes, while the minor-mode hooks might want to consider - ;; the major mode. - (git-commit-mode t) - (with-editor-mode t)) - (normal-mode t))) ;; Pretend that git-commit-mode is a major-mode, ;; so that directory-local settings can be used. (let ((default-directory @@ -557,9 +533,19 @@ to recover older messages") (major-mode 'git-commit-mode)) ; trick dir-locals-collect-variables (hack-dir-local-variables) (hack-local-variables-apply))) - ;; Show our own message using our hook. + (when git-commit-major-mode + (let ((auto-mode-alist (list (cons (concat "\\`" + (regexp-quote buffer-file-name) + "\\'") + git-commit-major-mode))) + ;; The major-mode hook might want to consult these minor + ;; modes, while the minor-mode hooks might want to consider + ;; the major mode. + (git-commit-mode t) + (with-editor-mode t)) + (normal-mode t))) + ;; Below we instead explicitly show a message. (setq with-editor-show-usage nil) - (setq with-editor-usage-message git-commit-usage-message) (unless with-editor-mode ;; Maybe already enabled when using `shell-command' or an Emacs shell. (with-editor-mode 1)) @@ -599,6 +585,12 @@ to recover older messages") (open-line 1))) (with-demoted-errors "Error running git-commit-setup-hook: %S" (run-hooks 'git-commit-setup-hook)) + (when git-commit-usage-message + (setq with-editor-usage-message git-commit-usage-message)) + (with-editor-usage-message) + (when-let ((format git-commit-header-line-format)) + (setq header-line-format + (if (stringp format) (substitute-command-keys format) format))) (set-buffer-modified-p nil)) (defun git-commit-run-post-finish-hook (previous) @@ -633,13 +625,7 @@ Don't use it directly, instead enable `global-git-commit-mode'." (setq-local paragraph-start (concat paragraph-start "\\|\\*\\|("))) (defun git-commit-turn-on-auto-fill () - "Unconditionally turn on Auto Fill mode. -If `git-commit-fill-column' is non-nil, and `fill-column' -doesn't already have a buffer-local value, then set that -to `git-commit-fill-column'." - (when (and (numberp git-commit-fill-column) - (not (local-variable-p 'fill-column))) - (setq fill-column git-commit-fill-column)) + "Unconditionally turn on Auto Fill mode." (setq-local comment-auto-fill-only-comments nil) (turn-on-auto-fill)) @@ -1143,7 +1129,7 @@ Added to `font-lock-extend-region-functions'." (define-derived-mode git-commit-elisp-text-mode text-mode "ElText" "Major mode for editing commit messages of elisp projects. This is intended for use as `git-commit-major-mode' for projects -that expect `symbols' to look like this. I.e. like they look in +that expect `symbols' to look like this. I.e., like they look in Elisp doc-strings, including this one. Unlike in doc-strings, \"strings\" also look different than the other text." (setq font-lock-defaults '(git-commit-elisp-text-mode-keywords))) diff --git a/elpa/git-link-20230420.48/git-link-pkg.el b/elpa/git-link-20230420.48/git-link-pkg.el deleted file mode 100644 index 48555697..00000000 --- a/elpa/git-link-20230420.48/git-link-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from git-link.el -*- no-byte-compile: t -*- -(define-package "git-link" "20230420.48" "Get the GitHub/Bitbucket/GitLab URL for a buffer location" '((emacs "24.3")) :commit "1727e9b7ec41a234a2cc14151b9ffd9c1c4f4b14" :authors '(("Skye Shaw" . "skye.shaw@gmail.com")) :maintainers '(("Skye Shaw" . "skye.shaw@gmail.com")) :maintainer '("Skye Shaw" . "skye.shaw@gmail.com") :keywords '("git" "vc" "github" "bitbucket" "gitlab" "sourcehut" "aws" "azure" "convenience") :url "http://github.com/sshaw/git-link") diff --git a/elpa/git-link-20230420.48/git-link-autoloads.el b/elpa/git-link-20230518.204/git-link-autoloads.el similarity index 96% rename from elpa/git-link-20230420.48/git-link-autoloads.el rename to elpa/git-link-20230518.204/git-link-autoloads.el index a617dfc8..e3ae51b5 100644 --- a/elpa/git-link-20230420.48/git-link-autoloads.el +++ b/elpa/git-link-20230518.204/git-link-autoloads.el @@ -48,6 +48,10 @@ Defaults to \"origin\". (register-definition-prefixes "git-link" '("git-link-")) +;;;*** + +;;;### (autoloads nil nil ("git-link-pkg.el") (0 0 0 0)) + ;;;*** ;; Local Variables: diff --git a/elpa/git-link-20230518.204/git-link-pkg.el b/elpa/git-link-20230518.204/git-link-pkg.el new file mode 100644 index 00000000..fac7e7e4 --- /dev/null +++ b/elpa/git-link-20230518.204/git-link-pkg.el @@ -0,0 +1,14 @@ +(define-package "git-link" "20230518.204" "Get the GitHub/Bitbucket/GitLab URL for a buffer location" + '((emacs "24.3")) + :commit "aded95807f277f30e1607313bdf9ac9a016a2305" :authors + '(("Skye Shaw" . "skye.shaw@gmail.com")) + :maintainers + '(("Skye Shaw" . "skye.shaw@gmail.com")) + :maintainer + '("Skye Shaw" . "skye.shaw@gmail.com") + :keywords + '("git" "vc" "github" "bitbucket" "gitlab" "sourcehut" "aws" "azure" "convenience") + :url "http://github.com/sshaw/git-link") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/git-link-20230420.48/git-link.el b/elpa/git-link-20230518.204/git-link.el similarity index 99% rename from elpa/git-link-20230420.48/git-link.el rename to elpa/git-link-20230518.204/git-link.el index 9387059f..d5a6d6d4 100644 --- a/elpa/git-link-20230420.48/git-link.el +++ b/elpa/git-link-20230518.204/git-link.el @@ -3,8 +3,6 @@ ;; Copyright (C) 2013-2022 Skye Shaw and others ;; Author: Skye Shaw ;; Version: 0.9.0 -;; Package-Version: 20230420.48 -;; Package-Commit: 1727e9b7ec41a234a2cc14151b9ffd9c1c4f4b14 ;; Keywords: git, vc, github, bitbucket, gitlab, sourcehut, aws, azure, convenience ;; URL: http://github.com/sshaw/git-link ;; Package-Requires: ((emacs "24.3")) @@ -244,7 +242,7 @@ As an example, \"gitlab\" will match with both \"gitlab.com\" and ("github" git-link-commit-github) ("bitbucket" git-link-commit-bitbucket) ("gitorious" git-link-commit-gitorious) - ("gitlab" git-link-commit-github) + ("gitlab" git-link-commit-gitlab) ("git\\.\\(sv\\|savannah\\)\\.gnu\\.org" git-link-commit-savannah) ("googlesource.com" git-link-commit-googlesource) ("visualstudio\\|azure" git-link-commit-azure) @@ -541,7 +539,7 @@ return (FILENAME . REVISION) otherwise nil." (format "L%s" start))))))) (defun git-link-gitlab (hostname dirname filename branch commit start end) - (format "https://%s/%s/blob/%s/%s" + (format "https://%s/%s/-/blob/%s/%s" hostname dirname (or branch commit) @@ -595,6 +593,11 @@ return (FILENAME . REVISION) otherwise nil." (format "L%s-%s" start end) (format "L%s" start))))))) +(defun git-link-commit-gitlab (hostname dirname commit) + (format "https://%s/%s/-/commit/%s" + hostname + dirname + commit)) (defun git-link-commit-github (hostname dirname commit) (format "https://%s/%s/commit/%s" diff --git a/elpa/git-timemachine-20230413.620/git-timemachine-pkg.el b/elpa/git-timemachine-20230413.620/git-timemachine-pkg.el deleted file mode 100644 index 5a989119..00000000 --- a/elpa/git-timemachine-20230413.620/git-timemachine-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from git-timemachine.el -*- no-byte-compile: t -*- -(define-package "git-timemachine" "20230413.620" "Walk through git revisions of a file" '((emacs "24.3") (transient "0.1.0")) :commit "13769fb603ae88c64566529eae4525ce88026e86" :authors '(("Peter Stiernström" . "peter@stiernstrom.se")) :maintainers '(("Peter Stiernström" . "peter@stiernstrom.se")) :maintainer '("Peter Stiernström" . "peter@stiernstrom.se") :keywords '("vc") :url "https://gitlab.com/pidu/git-timemachine") diff --git a/elpa/git-timemachine-20230413.620/git-timemachine-autoloads.el b/elpa/git-timemachine-20230630.1214/git-timemachine-autoloads.el similarity index 92% rename from elpa/git-timemachine-20230413.620/git-timemachine-autoloads.el rename to elpa/git-timemachine-20230630.1214/git-timemachine-autoloads.el index 7a2971bc..d196f94d 100644 --- a/elpa/git-timemachine-20230413.620/git-timemachine-autoloads.el +++ b/elpa/git-timemachine-20230630.1214/git-timemachine-autoloads.el @@ -23,6 +23,10 @@ Enable git timemachine for current buffer, switching to GIT-BRANCH. (register-definition-prefixes "git-timemachine" '("git-timemachine-")) +;;;*** + +;;;### (autoloads nil nil ("git-timemachine-pkg.el") (0 0 0 0)) + ;;;*** ;; Local Variables: diff --git a/elpa/git-timemachine-20230630.1214/git-timemachine-pkg.el b/elpa/git-timemachine-20230630.1214/git-timemachine-pkg.el new file mode 100644 index 00000000..03da2329 --- /dev/null +++ b/elpa/git-timemachine-20230630.1214/git-timemachine-pkg.el @@ -0,0 +1,15 @@ +(define-package "git-timemachine" "20230630.1214" "Walk through git revisions of a file" + '((emacs "24.3") + (transient "0.1.0")) + :commit "ac933e5cd29583c131401f3bd991d98129c316df" :authors + '(("Peter Stiernström" . "peter@stiernstrom.se")) + :maintainers + '(("Peter Stiernström" . "peter@stiernstrom.se")) + :maintainer + '("Peter Stiernström" . "peter@stiernstrom.se") + :keywords + '("vc") + :url "https://gitlab.com/pidu/git-timemachine") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/git-timemachine-20230413.620/git-timemachine.el b/elpa/git-timemachine-20230630.1214/git-timemachine.el old mode 100644 new mode 100755 similarity index 98% rename from elpa/git-timemachine-20230413.620/git-timemachine.el rename to elpa/git-timemachine-20230630.1214/git-timemachine.el index fac9d653..65bba0bd --- a/elpa/git-timemachine-20230413.620/git-timemachine.el +++ b/elpa/git-timemachine-20230630.1214/git-timemachine.el @@ -3,9 +3,7 @@ ;; Copyright (C) 2014 Peter Stiernström ;; Author: Peter Stiernström -;; Version: 4.12 -;; Package-Version: 20230413.620 -;; Package-Commit: 13769fb603ae88c64566529eae4525ce88026e86 +;; Version: 4.13 ;; URL: https://gitlab.com/pidu/git-timemachine ;; Keywords: vc ;; Package-Requires: ((emacs "24.3") (transient "0.1.0")) @@ -326,14 +324,14 @@ updated CURRENT-LINE." (message "You need to install magit for blame capabilities"))) (defun git-timemachine-kill-revision () - "Kill the current revisions abbreviated commit hash." + "Kill the current revision's full commit hash." (interactive) (let ((revision (car git-timemachine-revision))) (message revision) (kill-new revision))) (defun git-timemachine-kill-abbreviated-revision () - "Kill the current revisions full commit hash." + "Kill the current revision's abbreviated commit hash." (interactive) (let ((revision (git-timemachine-abbreviate (car git-timemachine-revision)))) (message revision) -- 2.47.3