From 2728df10193a801f5010736be6c445d12243eb03 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 2 Jan 2021 18:42:18 +0100 Subject: [PATCH] update magit and magit-todos --- elpa/magit-20201116.1057/magit-pkg.el | 12 - elpa/magit-20201116.1057/magit.info | 195 ------------ .../AUTHORS.md | 7 +- .../LICENSE | 0 .../dir | 0 .../git-rebase.el | 86 ++++-- .../magit-apply.el | 33 +- .../magit-autoloads.el | 283 +++++++----------- .../magit-autorevert.el | 0 .../magit-bisect.el | 0 .../magit-blame.el | 2 +- .../magit-bookmark.el | 0 .../magit-branch.el | 0 .../magit-clone.el | 0 .../magit-commit.el | 45 ++- .../magit-core.el | 0 .../magit-diff.el | 5 +- .../magit-ediff.el | 0 .../magit-extras.el | 63 +++- .../magit-fetch.el | 0 .../magit-files.el | 0 .../magit-git.el | 31 +- .../magit-gitignore.el | 0 .../magit-imenu.el | 0 .../magit-log.el | 70 ++++- .../magit-margin.el | 0 .../magit-merge.el | 8 + .../magit-mode.el | 53 ++-- .../magit-notes.el | 0 .../magit-obsolete.el | 0 .../magit-patch.el | 12 +- elpa/magit-20210102.1019/magit-pkg.el | 17 ++ .../magit-process.el | 0 .../magit-pull.el | 0 .../magit-push.el | 19 +- .../magit-reflog.el | 0 .../magit-refs.el | 0 .../magit-remote.el | 6 +- .../magit-repos.el | 0 .../magit-reset.el | 0 .../magit-section.el | 25 +- .../magit-sequence.el | 2 + .../magit-stash.el | 0 .../magit-status.el | 0 .../magit-submodule.el | 0 .../magit-subtree.el | 0 .../magit-tag.el | 0 .../magit-transient.el | 0 .../magit-utils.el | 12 +- .../magit-wip.el | 0 .../magit-worktree.el | 0 .../magit.el | 1 + elpa/magit-20210102.1019/magit.info | 195 ++++++++++++ .../magit.info-1 | 18 +- .../magit.info-2 | 19 +- .../magit-todos-pkg.el | 2 - .../magit-todos-autoloads.el | 5 + .../magit-todos-pkg.el | 2 + .../magit-todos.el | 27 +- 59 files changed, 708 insertions(+), 547 deletions(-) delete mode 100644 elpa/magit-20201116.1057/magit-pkg.el delete mode 100644 elpa/magit-20201116.1057/magit.info rename elpa/{magit-20201116.1057 => magit-20210102.1019}/AUTHORS.md (98%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/LICENSE (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/dir (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/git-rebase.el (92%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-apply.el (97%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-autoloads.el (94%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-autorevert.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-bisect.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-blame.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-bookmark.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-branch.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-clone.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-commit.el (94%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-core.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-diff.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-ediff.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-extras.el (92%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-fetch.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-files.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-git.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-gitignore.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-imenu.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-log.el (97%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-margin.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-merge.el (97%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-mode.el (97%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-notes.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-obsolete.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-patch.el (96%) create mode 100644 elpa/magit-20210102.1019/magit-pkg.el rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-process.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-pull.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-push.el (95%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-reflog.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-refs.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-remote.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-repos.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-reset.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-section.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-sequence.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-stash.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-status.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-submodule.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-subtree.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-tag.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-transient.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-utils.el (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-wip.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit-worktree.el (100%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit.el (99%) create mode 100644 elpa/magit-20210102.1019/magit.info rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit.info-1 (99%) rename elpa/{magit-20201116.1057 => magit-20210102.1019}/magit.info-2 (99%) delete mode 100644 elpa/magit-todos-20200310.28/magit-todos-pkg.el rename elpa/{magit-todos-20200310.28 => magit-todos-20201101.2240}/magit-todos-autoloads.el (85%) create mode 100644 elpa/magit-todos-20201101.2240/magit-todos-pkg.el rename elpa/{magit-todos-20200310.28 => magit-todos-20201101.2240}/magit-todos.el (98%) diff --git a/elpa/magit-20201116.1057/magit-pkg.el b/elpa/magit-20201116.1057/magit-pkg.el deleted file mode 100644 index bdb9ca42..00000000 --- a/elpa/magit-20201116.1057/magit-pkg.el +++ /dev/null @@ -1,12 +0,0 @@ -(define-package "magit" "20201116.1057" "A Git porcelain inside Emacs." - '((emacs "25.1") - (async "20200113") - (dash "20200524") - (git-commit "20200516") - (transient "20200601") - (with-editor "20200522")) - :commit "dc6dd40f1ab4abb32a1babf8c8f23ccbeb6c39c6" :keywords - ("git" "tools" "vc")) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/magit-20201116.1057/magit.info b/elpa/magit-20201116.1057/magit.info deleted file mode 100644 index 74bb6523..00000000 --- a/elpa/magit-20201116.1057/magit.info +++ /dev/null @@ -1,195 +0,0 @@ -This is magit.info, produced by makeinfo version 6.5 from magit.texi. - - Copyright (C) 2015-2020 Jonas Bernoulli - - You can redistribute this document and/or modify it under the terms - of the GNU General Public License as published by the Free Software - Foundation, either version 3 of the License, or (at your option) - any later version. - - This document is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - -INFO-DIR-SECTION Emacs -START-INFO-DIR-ENTRY -* Magit: (magit). Using Git from Emacs with Magit. -END-INFO-DIR-ENTRY - - -Indirect: -magit.info-1: 754 -magit.info-2: 300791 - -Tag Table: -(Indirect) -Node: Top754 -Node: Introduction6512 -Node: Installation11235 -Node: Installing from Melpa11565 -Node: Installing from the Git Repository12638 -Node: Post-Installation Tasks15370 -Node: Getting Started16655 -Node: Interface Concepts21898 -Node: Modes and Buffers22259 -Node: Switching Buffers24008 -Node: Naming Buffers28759 -Node: Quitting Windows32066 -Node: Automatic Refreshing of Magit Buffers33812 -Node: Automatic Saving of File-Visiting Buffers36664 -Node: Automatic Reverting of File-Visiting Buffers37849 -Node: Risk of Reverting Automatically42844 -Node: Sections45226 -Node: Section Movement46152 -Node: Section Visibility51062 -Node: Section Hooks57139 -Node: Section Types and Values59546 -Node: Section Options60849 -Node: Transient Commands61321 -Node: Transient Arguments and Buffer Variables62558 -Node: Completion Confirmation and the Selection69576 -Node: Action Confirmation70020 -Node: Completion and Confirmation77370 -Node: The Selection80556 -Node: The hunk-internal region83455 -Node: Support for Completion Frameworks84544 -Node: Additional Completion Options89451 -Node: Running Git90050 -Node: Viewing Git Output90323 -Node: Git Process Status91456 -Node: Running Git Manually92421 -Node: Git Executable94891 -Node: Global Git Arguments97173 -Node: Inspecting97979 -Node: Status Buffer99136 -Node: Status Sections103126 -Node: Status Header Sections108678 -Node: Status Module Sections111308 -Node: Status Options113813 -Node: Repository List115282 -Node: Logging118320 -Node: Refreshing Logs120881 -Node: Log Buffer122327 -Node: Log Margin126183 -Node: Select from Log129362 -Node: Reflog131587 -Node: Cherries133244 -Node: Diffing135092 -Node: Refreshing Diffs138171 -Node: Commands Available in Diffs141750 -Node: Diff Options144286 -Node: Revision Buffer149324 -Node: Ediffing152654 -Node: References Buffer156302 -Node: References Sections166822 -Node: Bisecting167683 -Node: Visiting Files and Blobs169496 -Node: General-Purpose Visit Commands169966 -Node: Visiting Files and Blobs from a Diff170922 -Node: Blaming174381 -Node: Manipulating180722 -Node: Creating Repository181064 -Node: Cloning Repository181619 -Node: Staging and Unstaging187024 -Node: Staging from File-Visiting Buffers191107 -Node: Applying192275 -Node: Committing194168 -Node: Initiating a Commit194751 -Node: Editing Commit Messages198136 -Node: Using the Revision Stack200939 -Node: Commit Pseudo Headers203990 -Node: Commit Mode and Hooks205326 -Node: Commit Message Conventions208264 -Node: Branching210392 -Node: The Two Remotes210618 -Node: Branch Commands213271 -Node: Branch Git Variables225652 -Node: Auxiliary Branch Commands231043 -Node: Merging232161 -Node: Resolving Conflicts236169 -Node: Rebasing241170 -Node: Editing Rebase Sequences246029 -Node: Information About In-Progress Rebase250357 -Ref: Information About In-Progress Rebase-Footnote-1259239 -Node: Cherry Picking259835 -Node: Reverting264166 -Node: Resetting265615 -Node: Stashing267481 -Node: Transferring272182 -Node: Remotes272404 -Node: Remote Commands272556 -Node: Remote Git Variables276637 -Node: Fetching277916 -Node: Pulling280403 -Node: Pushing281449 -Node: Plain Patches285202 -Node: Maildir Patches286693 -Node: Miscellaneous288207 -Node: Tagging288521 -Node: Notes290438 -Node: Submodules292810 -Node: Listing Submodules293028 -Node: Submodule Transient294434 -Node: Subtree296956 -Node: Worktree298932 -Node: Common Commands300791 -Node: Wip Modes302838 -Node: Wip Graph307769 -Node: Legacy Wip Modes310083 -Node: Commands for Buffers Visiting Files312978 -Node: Minor Mode for Buffers Visiting Blobs318600 -Node: Customizing319411 -Node: Per-Repository Configuration321007 -Node: Essential Settings323262 -Node: Safety323607 -Node: Performance325368 -Node: Microsoft Windows Performance332536 -Node: MacOS Performance333727 -Ref: MacOS Performance-Footnote-1334742 -Node: Default Bindings334824 -Node: Plumbing336679 -Node: Calling Git337508 -Node: Getting a Value from Git339033 -Node: Calling Git for Effect342119 -Node: Section Plumbing348641 -Node: Creating Sections348869 -Node: Section Selection352769 -Node: Matching Sections354568 -Node: Refreshing Buffers360541 -Node: Conventions363689 -Node: Theming Faces363881 -Node: FAQ371996 -Node: FAQ - How to ...?372438 -Node: How to pronounce Magit?372851 -Node: How to show git's output?373653 -Node: How to install the gitman info manual?374439 -Node: How to show diffs for gpg-encrypted files?375409 -Node: How does branching and pushing work?376005 -Node: Can Magit be used as ediff-version-control-package?376368 -Node: Should I disable VC?378386 -Node: FAQ - Issues and Errors379004 -Node: Magit is slow379900 -Node: I changed several thousand files at once and now Magit is unusable380114 -Node: I am having problems committing380843 -Node: I am using MS Windows and cannot push with Magit381324 -Node: I am using OS X and SOMETHING works in shell but not in Magit381941 -Node: Expanding a file to show the diff causes it to disappear382772 -Node: Point is wrong in the COMMIT_EDITMSG buffer383353 -Node: The mode-line information isn't always up-to-date384399 -Node: A branch and tag sharing the same name breaks SOMETHING385462 -Node: My Git hooks work on the command-line but not inside Magit386348 -Node: git-commit-mode isn't used when committing from the command-line387194 -Node: Point ends up inside invisible text when jumping to a file-visiting buffer389465 -Node: Debugging Tools390263 -Node: Keystroke Index392442 -Node: Command Index426475 -Node: Function Index463541 -Node: Variable Index479812 - -End Tag Table - - -Local Variables: -coding: utf-8 -End: diff --git a/elpa/magit-20201116.1057/AUTHORS.md b/elpa/magit-20210102.1019/AUTHORS.md similarity index 98% rename from elpa/magit-20201116.1057/AUTHORS.md rename to elpa/magit-20210102.1019/AUTHORS.md index 896d1277..6cde4d85 100644 --- a/elpa/magit-20201116.1057/AUTHORS.md +++ b/elpa/magit-20210102.1019/AUTHORS.md @@ -157,6 +157,7 @@ Contributors - Hans-Peter Deifel - Hussein Ait-Lahcen - Ian Eure +- Ian Milligan - Ingo Lohmar - Ioan-Adrian Ratiu - Ivan Brennan @@ -169,7 +170,7 @@ Contributors - Jim Blandy - Joakim Jalap - Johannes Altmanninger -- Johann Klähn +- Johann Klähn - John Mastro - John Morris - John Wiegley @@ -266,6 +267,7 @@ Contributors - Peter J. Weisberg - Peter Vasil - Philippe Vaucher +- Philipp Fehre - Philipp Haselwarter - Philipp Stephani - Philip Weaver @@ -306,6 +308,7 @@ Contributors - Sergey Vinokurov - Servilio Afre Puentes - Silent Sphere +- Simon Pintarelli - Štěpán Němec - Steven Chow - Steven E. Harris @@ -319,7 +322,7 @@ Contributors - Tassilo Horn - Teemu Likonen - Teruki Shigitani -- Thierry Volpiatto +- Thierry Volpiatto - Thomas A Caswell - Thomas Fini Hansen - Thomas Frössman diff --git a/elpa/magit-20201116.1057/LICENSE b/elpa/magit-20210102.1019/LICENSE similarity index 100% rename from elpa/magit-20201116.1057/LICENSE rename to elpa/magit-20210102.1019/LICENSE diff --git a/elpa/magit-20201116.1057/dir b/elpa/magit-20210102.1019/dir similarity index 100% rename from elpa/magit-20201116.1057/dir rename to elpa/magit-20210102.1019/dir diff --git a/elpa/magit-20201116.1057/git-rebase.el b/elpa/magit-20210102.1019/git-rebase.el similarity index 92% rename from elpa/magit-20201116.1057/git-rebase.el rename to elpa/magit-20210102.1019/git-rebase.el index 886fbbb9..f4999501 100644 --- a/elpa/magit-20201116.1057/git-rebase.el +++ b/elpa/magit-20210102.1019/git-rebase.el @@ -223,27 +223,32 @@ ;;; Commands (defun git-rebase-pick () - "Use commit on current line." + "Use commit on current line. +If the region is active, act on all lines touched by the region." (interactive) (git-rebase-set-action "pick")) (defun git-rebase-reword () - "Edit message of commit on current line." + "Edit message of commit on current line. +If the region is active, act on all lines touched by the region." (interactive) (git-rebase-set-action "reword")) (defun git-rebase-edit () - "Stop at the commit on the current line." + "Stop at the commit on the current line. +If the region is active, act on all lines touched by the region." (interactive) (git-rebase-set-action "edit")) (defun git-rebase-squash () - "Meld commit on current line into previous commit, edit message." + "Meld commit on current line into previous commit, edit message. +If the region is active, act on all lines touched by the region." (interactive) (git-rebase-set-action "squash")) (defun git-rebase-fixup () - "Meld commit on current line into previous commit, discard its message." + "Meld commit on current line into previous commit, discard its message. +If the region is active, act on all lines touched by the region." (interactive) (git-rebase-set-action "fixup")) @@ -327,16 +332,40 @@ instance with all nil values is returned." (git-rebase-action)))) (defun git-rebase-set-action (action) - (goto-char (line-beginning-position)) - (with-slots (action-type target trailer) - (git-rebase-current-line) - (if (eq action-type 'commit) - (let ((inhibit-read-only t)) - (magit-delete-line) - (insert (concat action " " target " " trailer "\n")) - (unless git-rebase-auto-advance - (forward-line -1))) - (ding)))) + "Set action of commit line to ACTION. +If the region is active, operate on all lines that it touches. +Otherwise, operate on the current line. As a special case, an +ACTION of nil comments the rebase line, regardless of its action +type." + (pcase (git-rebase-region-bounds t) + (`(,beg ,end) + (let ((end-marker (copy-marker end)) + (pt-below-p (and mark-active (< (mark) (point))))) + (set-marker-insertion-type end-marker t) + (goto-char beg) + (while (< (point) end-marker) + (with-slots (action-type target trailer comment-p) + (git-rebase-current-line) + (cond + ((and action (eq action-type 'commit)) + (let ((inhibit-read-only t)) + (magit-delete-line) + (insert (concat action " " target " " trailer "\n")))) + ((and action-type (not (or action comment-p))) + (let ((inhibit-read-only t)) + (insert comment-start " ")) + (forward-line)) + (t + ;; In the case of --rebase-merges, commit lines may have + ;; other lines with other action types, empty lines, and + ;; "Branch" comments interspersed. Move along. + (forward-line))))) + (goto-char + (if git-rebase-auto-advance + end-marker + (if pt-below-p (1- end-marker) beg))) + (goto-char (line-beginning-position)))) + (_ (ding)))) (defun git-rebase-line-p (&optional pos) (save-excursion @@ -344,15 +373,24 @@ instance with all nil values is returned." (and (oref (git-rebase-current-line) action-type) t))) -(defun git-rebase-region-bounds () - (when (use-region-p) +(defun git-rebase-region-bounds (&optional fallback) + "Return region bounds if both ends touch rebase lines. +Each bound is extended to include the entire line touched by the +point or mark. If the region isn't active and FALLBACK is +non-nil, return the beginning and end of the current rebase line, +if any." + (cond + ((use-region-p) (let ((beg (save-excursion (goto-char (region-beginning)) (line-beginning-position))) (end (save-excursion (goto-char (region-end)) (line-end-position)))) (when (and (git-rebase-line-p beg) (git-rebase-line-p end)) - (list beg (1+ end)))))) + (list beg (1+ end))))) + ((and fallback (git-rebase-line-p)) + (list (line-beginning-position) + (1+ (line-end-position)))))) (defun git-rebase-move-line-down (n) "Move the current commit (or command) N lines down. @@ -423,16 +461,10 @@ current line." (funcall (default-value 'redisplay-unhighlight-region-function) rol)) (defun git-rebase-kill-line () - "Kill the current action line." + "Kill the current action line. +If the region is active, act on all lines touched by the region." (interactive) - (goto-char (line-beginning-position)) - (unless (oref (git-rebase-current-line) comment-p) - (let ((inhibit-read-only t)) - (insert comment-start) - (insert " ")) - (goto-char (line-beginning-position)) - (when git-rebase-auto-advance - (forward-line)))) + (git-rebase-set-action nil)) (defun git-rebase-insert (rev) "Read an arbitrary commit and insert it below current line." diff --git a/elpa/magit-20201116.1057/magit-apply.el b/elpa/magit-20210102.1019/magit-apply.el similarity index 97% rename from elpa/magit-20201116.1057/magit-apply.el rename to elpa/magit-20210102.1019/magit-apply.el index 766a3ccc..79e997a3 100644 --- a/elpa/magit-20201116.1057/magit-apply.el +++ b/elpa/magit-20210102.1019/magit-apply.el @@ -53,6 +53,7 @@ (path &optional prefer-short)) (declare-function borg--maybe-absorb-gitdir "borg" (pkg)) (declare-function borg--sort-submodule-sections "borg" (file)) +(declare-function borg-assimilate "borg" (package url &optional partially)) (defvar borg-user-emacs-directory) ;;; Options @@ -362,28 +363,24 @@ ignored) files." `((file . ,repo) (untracked) (status))) start)) (let* ((topdir (magit-toplevel)) + (url (let ((default-directory + (file-name-as-directory (expand-file-name repo)))) + (or (magit-get "remote" (magit-get-some-remote) "url") + (concat (file-name-as-directory ".") repo)))) (package (and (equal (bound-and-true-p borg-user-emacs-directory) topdir) (file-name-nondirectory (directory-file-name repo))))) - (magit-submodule-add-1 - (let ((default-directory - (file-name-as-directory (expand-file-name repo)))) - (or (magit-get "remote" (magit-get-some-remote) "url") - (concat (file-name-as-directory ".") repo))) - repo - (magit-submodule-read-name-for-path repo package)) - (when package - (borg--sort-submodule-sections - (expand-file-name ".gitmodules" topdir)) - (let ((default-directory borg-user-emacs-directory)) - (borg--maybe-absorb-gitdir package)) - (when (and (y-or-n-p - (format "Also build and activate `%s' drone?" package)) - (fboundp 'borg-build) - (fboundp 'borg-activate)) - (borg-build package) - (borg-activate package)))))) + (if (and package + (y-or-n-p (format "Also assimilate `%s' drone?" package))) + (borg-assimilate package url) + (magit-submodule-add-1 + url repo (magit-submodule-read-name-for-path repo package)) + (when package + (borg--sort-submodule-sections + (expand-file-name ".gitmodules" topdir)) + (let ((default-directory borg-user-emacs-directory)) + (borg--maybe-absorb-gitdir package))))))) (magit-wip-commit-after-apply files " after stage"))) ;;;; Unstage diff --git a/elpa/magit-20201116.1057/magit-autoloads.el b/elpa/magit-20210102.1019/magit-autoloads.el similarity index 94% rename from elpa/magit-20201116.1057/magit-autoloads.el rename to elpa/magit-20210102.1019/magit-autoloads.el index a9a3f374..82811026 100644 --- a/elpa/magit-20201116.1057/magit-autoloads.el +++ b/elpa/magit-20210102.1019/magit-autoloads.el @@ -12,9 +12,7 @@ (autoload 'git-rebase-current-line "git-rebase" "\ Parse current line into a `git-rebase-action' instance. If the current line isn't recognized as a rebase line, an -instance with all nil values is returned. - -\(fn)" nil nil) +instance with all nil values is returned." nil nil) (autoload 'git-rebase-mode "git-rebase" "\ Major mode for editing of a Git rebase file. @@ -164,9 +162,7 @@ without requiring confirmation. \(fn FILE)" t nil) (autoload 'magit-unstage-all "magit-apply" "\ -Remove all changes from the staging area. - -\(fn)" t nil) +Remove all changes from the staging area." t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-apply" '("magit-"))) @@ -176,6 +172,8 @@ Remove all changes from the staging area. ;;;;;; 0 0 0)) ;;; Generated autoloads from magit-autorevert.el +(put 'magit-auto-revert-mode 'globalized-minor-mode t) + (defvar magit-auto-revert-mode (not (or global-auto-revert-mode noninteractive)) "\ Non-nil if Magit-Auto-Revert mode is enabled. See the `magit-auto-revert-mode' command @@ -217,30 +215,22 @@ other actions from the bisect transient command (\\\\[mag \(fn BAD GOOD ARGS)" t nil) (autoload 'magit-bisect-reset "magit-bisect" "\ -After bisecting, cleanup bisection state and return to original `HEAD'. - -\(fn)" t nil) +After bisecting, cleanup bisection state and return to original `HEAD'." t nil) (autoload 'magit-bisect-good "magit-bisect" "\ While bisecting, mark the current commit as good. Use this after you have asserted that the commit does not contain -the bug in question. - -\(fn)" t nil) +the bug in question." t nil) (autoload 'magit-bisect-bad "magit-bisect" "\ While bisecting, mark the current commit as bad. Use this after you have asserted that the commit does contain the -bug in question. - -\(fn)" t nil) +bug in question." t nil) (autoload 'magit-bisect-skip "magit-bisect" "\ While bisecting, skip the current commit. Use this if for some reason the current commit is not a good one -to test. This command lets Git choose a different one. - -\(fn)" t nil) +to test. This command lets Git choose a different one." t nil) (autoload 'magit-bisect-run "magit-bisect" "\ Bisect automatically by running commands after each step. @@ -590,6 +580,11 @@ that is you) or committer date is available as the previous history element. \(fn DATE)" t nil) + +(autoload 'magit-commit-absorb-modules "magit-commit" "\ +Spread modified modules across recent commits. + +\(fn PHASE COMMIT)" t nil) (autoload 'magit-commit-absorb "magit-commit" nil t) (autoload 'magit-commit-autofixup "magit-commit" nil t) @@ -661,9 +656,7 @@ Show diff for the blob or file visited in the current buffer. When the buffer visits a blob, then show the respective commit. When the buffer visits a file, then show the differenced between `HEAD' and the working tree. In both cases limit the diff to -the file or blob. - -\(fn)" t nil) +the file or blob." t nil) (autoload 'magit-diff-paths "magit-diff" "\ Show changes between any two files on disk. @@ -724,9 +717,7 @@ might only be able to guess either the file, or range or commit, in which case the user is asked about the other. It might not always guess right, in which case the appropriate `magit-ediff-*' command has to be used explicitly. If it cannot read the user's -mind at all, then it asks the user for a command to run. - -\(fn)" t nil) +mind at all, then it asks the user for a command to run." t nil) (autoload 'magit-ediff-show-staged "magit-ediff" "\ Show staged changes using Ediff. @@ -775,9 +766,7 @@ stash that were staged. ;;; Generated autoloads from magit-extras.el (autoload 'magit-run-git-gui "magit-extras" "\ -Run `git gui' for the current git repository. - -\(fn)" t nil) +Run `git gui' for the current git repository." t nil) (autoload 'magit-run-git-gui-blame "magit-extras" "\ Run `git gui blame' on the given FILENAME and COMMIT. @@ -789,19 +778,13 @@ blame to center around the line point is on. \(fn COMMIT FILENAME &optional LINENUM)" t nil) (autoload 'magit-run-gitk "magit-extras" "\ -Run `gitk' in the current repository. - -\(fn)" t nil) +Run `gitk' in the current repository." t nil) (autoload 'magit-run-gitk-branches "magit-extras" "\ -Run `gitk --branches' in the current repository. - -\(fn)" t nil) +Run `gitk --branches' in the current repository." t nil) (autoload 'magit-run-gitk-all "magit-extras" "\ -Run `gitk --all' in the current repository. - -\(fn)" t nil) +Run `gitk --all' in the current repository." t nil) (autoload 'ido-enter-magit-status "magit-extras" "\ Drop into `magit-status' from file switching. @@ -822,14 +805,10 @@ instead of every time Ido is invoked, so now you can modify it like pretty much every other keymap: (define-key ido-common-completion-map - (kbd \"C-x g\") \\='ido-enter-magit-status) - -\(fn)" t nil) + (kbd \"C-x g\") \\='ido-enter-magit-status)" t nil) (autoload 'magit-project-status "magit-extras" "\ -Run `magit-status' in the current project's root. - -\(fn)" t nil) +Run `magit-status' in the current project's root." t nil) (autoload 'magit-dired-jump "magit-extras" "\ Visit file at point using Dired. @@ -993,10 +972,12 @@ argument is used, then save the revision at its tip to the When the region is active, then save that to the `kill-ring', like `kill-ring-save' would, instead of behaving as described -above. If a prefix argument is used and the region is within a -hunk, strip the outer diff marker column. +above. If a prefix argument is used and the region is within +a hunk, then strip the diff marker column and keep only either +the added or removed lines, depending on the sign of the prefix +argument. -\(fn)" t nil) +\(fn ARG)" t nil) (autoload 'magit-copy-buffer-revision "magit-extras" "\ Save the revision of the current buffer for later use. @@ -1022,16 +1003,12 @@ above. When `magit-copy-revision-abbreviated' is non-nil, save the abbreviated revision to the `kill-ring' and the -`magit-revision-stack'. - -\(fn)" t nil) +`magit-revision-stack'." t nil) (autoload 'magit-abort-dwim "magit-extras" "\ Abort current operation. Depending on the context, this will abort a merge, a rebase, a -patch application, a cherry-pick, a revert, or a bisect. - -\(fn)" t nil) +patch application, a cherry-pick, a revert, or a bisect." t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-extras" '("magit-"))) @@ -1066,14 +1043,10 @@ Fetch from all remotes. (autoload 'magit-fetch-all-prune "magit-fetch" "\ Fetch from all remotes, and prune. Prune remote tracking branches for branches that have been -removed on the respective remote. - -\(fn)" t nil) +removed on the respective remote." t nil) (autoload 'magit-fetch-all-no-prune "magit-fetch" "\ -Fetch from all remotes. - -\(fn)" t nil) +Fetch from all remotes." t nil) (autoload 'magit-fetch-modules "magit-fetch" "\ Fetch all submodules. @@ -1123,9 +1096,7 @@ the line and column corresponding to that location. (autoload 'magit-blob-visit-file "magit-files" "\ View the file from the worktree corresponding to the current blob. When visiting a blob or the version from the index, then go to -the same location in the respective file in the working tree. - -\(fn)" t nil) +the same location in the respective file in the working tree." t nil) (autoload 'magit-file-checkout "magit-files" "\ Checkout FILE from REV. @@ -1206,113 +1177,83 @@ Call \"git update-index --no-assume-unchanged -- FILE\". (autoload 'magit-imenu--log-prev-index-position-function "magit-imenu" "\ Move point to previous line in current buffer. This function is used as a value for -`imenu-prev-index-position-function'. - -\(fn)" nil nil) +`imenu-prev-index-position-function'." nil nil) (autoload 'magit-imenu--log-extract-index-name-function "magit-imenu" "\ Return imenu name for line at point. This function is used as a value for `imenu-extract-index-name-function'. Point should be at the -beginning of the line. - -\(fn)" nil nil) +beginning of the line." nil nil) (autoload 'magit-imenu--diff-prev-index-position-function "magit-imenu" "\ Move point to previous file line in current buffer. This function is used as a value for -`imenu-prev-index-position-function'. - -\(fn)" nil nil) +`imenu-prev-index-position-function'." nil nil) (autoload 'magit-imenu--diff-extract-index-name-function "magit-imenu" "\ Return imenu name for line at point. This function is used as a value for `imenu-extract-index-name-function'. Point should be at the -beginning of the line. - -\(fn)" nil nil) +beginning of the line." nil nil) (autoload 'magit-imenu--status-create-index-function "magit-imenu" "\ Return an alist of all imenu entries in current buffer. This function is used as a value for -`imenu-create-index-function'. - -\(fn)" nil nil) +`imenu-create-index-function'." nil nil) (autoload 'magit-imenu--refs-create-index-function "magit-imenu" "\ Return an alist of all imenu entries in current buffer. This function is used as a value for -`imenu-create-index-function'. - -\(fn)" nil nil) +`imenu-create-index-function'." nil nil) (autoload 'magit-imenu--cherry-create-index-function "magit-imenu" "\ Return an alist of all imenu entries in current buffer. This function is used as a value for -`imenu-create-index-function'. - -\(fn)" nil nil) +`imenu-create-index-function'." nil nil) (autoload 'magit-imenu--submodule-prev-index-position-function "magit-imenu" "\ Move point to previous line in magit-submodule-list buffer. This function is used as a value for -`imenu-prev-index-position-function'. - -\(fn)" nil nil) +`imenu-prev-index-position-function'." nil nil) (autoload 'magit-imenu--submodule-extract-index-name-function "magit-imenu" "\ Return imenu name for line at point. This function is used as a value for `imenu-extract-index-name-function'. Point should be at the -beginning of the line. - -\(fn)" nil nil) +beginning of the line." nil nil) (autoload 'magit-imenu--repolist-prev-index-position-function "magit-imenu" "\ Move point to previous line in magit-repolist buffer. This function is used as a value for -`imenu-prev-index-position-function'. - -\(fn)" nil nil) +`imenu-prev-index-position-function'." nil nil) (autoload 'magit-imenu--repolist-extract-index-name-function "magit-imenu" "\ Return imenu name for line at point. This function is used as a value for `imenu-extract-index-name-function'. Point should be at the -beginning of the line. - -\(fn)" nil nil) +beginning of the line." nil nil) (autoload 'magit-imenu--process-prev-index-position-function "magit-imenu" "\ Move point to previous process in magit-process buffer. This function is used as a value for -`imenu-prev-index-position-function'. - -\(fn)" nil nil) +`imenu-prev-index-position-function'." nil nil) (autoload 'magit-imenu--process-extract-index-name-function "magit-imenu" "\ Return imenu name for line at point. This function is used as a value for `imenu-extract-index-name-function'. Point should be at the -beginning of the line. - -\(fn)" nil nil) +beginning of the line." nil nil) (autoload 'magit-imenu--rebase-prev-index-position-function "magit-imenu" "\ Move point to previous commit in git-rebase buffer. This function is used as a value for -`imenu-prev-index-position-function'. - -\(fn)" nil nil) +`imenu-prev-index-position-function'." nil nil) (autoload 'magit-imenu--rebase-extract-index-name-function "magit-imenu" "\ Return imenu name for line at point. This function is used as a value for `imenu-extract-index-name-function'. Point should be at the -beginning of the line. - -\(fn)" nil nil) +beginning of the line." nil nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-imenu" '("magit-imenu--index-function"))) @@ -1399,6 +1340,17 @@ https://github.com/mhagger/git-when-merged. Move to the Nth parent of the current commit. \(fn &optional N)" t nil) + (autoload 'magit-shortlog "magit-log" nil t) + +(autoload 'magit-shortlog-since "magit-log" "\ +Show a history summary for commits since REV. + +\(fn REV ARGS)" t nil) + +(autoload 'magit-shortlog-range "magit-log" "\ +Show a history summary for commit or range REV-OR-RANGE. + +\(fn REV-OR-RANGE ARGS)" t nil) (autoload 'magit-cherry "magit-log" "\ Show commits in a branch that are not merged in the upstream branch. @@ -1490,9 +1442,7 @@ Preview result of merging REV into the current branch. (autoload 'magit-merge-abort "magit-merge" "\ Abort the current merge operation. -\(git merge --abort) - -\(fn)" t nil) +\(git merge --abort)" t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-merge" '("magit-"))) @@ -1501,7 +1451,7 @@ Abort the current merge operation. ;;;### (autoloads nil "magit-mode" "magit-mode.el" (0 0 0 0)) ;;; Generated autoloads from magit-mode.el -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-mode" '("magit-" "disable-magit-save-buffers" "inhibit-magit-refresh"))) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-mode" '("disable-magit-save-buffers" "inhibit-magit-refresh" "magit-"))) ;;;*** @@ -1662,9 +1612,7 @@ these Git variables: `push.default', `remote.pushDefault', (autoload 'magit-reflog-current "magit-reflog" "\ Display the reflog of the current branch. -If `HEAD' is detached, then show the reflog for that instead. - -\(fn)" t nil) +If `HEAD' is detached, then show the reflog for that instead." t nil) (autoload 'magit-reflog-other "magit-reflog" "\ Display the reflog of a branch or another ref. @@ -1672,9 +1620,7 @@ Display the reflog of a branch or another ref. \(fn REF)" t nil) (autoload 'magit-reflog-head "magit-reflog" "\ -Display the `HEAD' reflog. - -\(fn)" t nil) +Display the `HEAD' reflog." t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-reflog" '("magit-reflog-"))) @@ -1773,9 +1719,7 @@ Delete the symbolic-ref \"refs/remotes//HEAD\". Display a list of repositories. Use the options `magit-repository-directories' to control which -repositories are displayed. - -\(fn)" t nil) +repositories are displayed." t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-repos" '("magit-"))) @@ -1843,7 +1787,7 @@ With a prefix argument reset the working tree otherwise don't. ;;;### (autoloads nil "magit-section" "magit-section.el" (0 0 0 0)) ;;; Generated autoloads from magit-section.el -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-section" '("magit-" "isearch-clean-overlays@magit-mode"))) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-section" '("isearch-clean-overlays@magit-mode" "magit-"))) ;;;*** @@ -1852,20 +1796,14 @@ With a prefix argument reset the working tree otherwise don't. ;;; Generated autoloads from magit-sequence.el (autoload 'magit-sequencer-continue "magit-sequence" "\ -Resume the current cherry-pick or revert sequence. - -\(fn)" t nil) +Resume the current cherry-pick or revert sequence." t nil) (autoload 'magit-sequencer-skip "magit-sequence" "\ -Skip the stopped at commit during a cherry-pick or revert sequence. - -\(fn)" t nil) +Skip the stopped at commit during a cherry-pick or revert sequence." t nil) (autoload 'magit-sequencer-abort "magit-sequence" "\ Abort the current cherry-pick or revert sequence. -This discards all changes made since the sequence started. - -\(fn)" t nil) +This discards all changes made since the sequence started." t nil) (autoload 'magit-cherry-pick "magit-sequence" nil t) (autoload 'magit-cherry-copy "magit-sequence" "\ @@ -1945,20 +1883,14 @@ Apply the patches from MAILDIR. \(fn &optional MAILDIR ARGS)" t nil) (autoload 'magit-am-continue "magit-sequence" "\ -Resume the current patch applying sequence. - -\(fn)" t nil) +Resume the current patch applying sequence." t nil) (autoload 'magit-am-skip "magit-sequence" "\ -Skip the stopped at patch during a patch applying sequence. - -\(fn)" t nil) +Skip the stopped at patch during a patch applying sequence." t nil) (autoload 'magit-am-abort "magit-sequence" "\ Abort the current patch applying sequence. -This discards all changes made since the sequence started. - -\(fn)" t nil) +This discards all changes made since the sequence started." t nil) (autoload 'magit-rebase "magit-sequence" nil t) (autoload 'magit-rebase-onto-pushremote "magit-sequence" nil t) (autoload 'magit-rebase-onto-upstream "magit-sequence" nil t) @@ -2010,19 +1942,13 @@ edit. With a prefix argument the old message is reused as-is. \(fn &optional NOEDIT)" t nil) (autoload 'magit-rebase-skip "magit-sequence" "\ -Skip the current commit and restart the current rebase operation. - -\(fn)" t nil) +Skip the current commit and restart the current rebase operation." t nil) (autoload 'magit-rebase-edit "magit-sequence" "\ -Edit the todo list of the current rebase operation. - -\(fn)" t nil) +Edit the todo list of the current rebase operation." t nil) (autoload 'magit-rebase-abort "magit-sequence" "\ -Abort the current rebase operation, restoring the original branch. - -\(fn)" t nil) +Abort the current rebase operation, restoring the original branch." t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-sequence" '("magit-"))) @@ -2075,9 +2001,7 @@ while two prefix arguments are equivalent to `--all'. (autoload 'magit-snapshot-index "magit-stash" "\ Create a snapshot of the index only. -Unstaged and untracked changes are not stashed. - -\(fn)" t nil) +Unstaged and untracked changes are not stashed." t nil) (autoload 'magit-snapshot-worktree "magit-stash" "\ Create a snapshot of unstaged changes in the working tree. @@ -2123,9 +2047,7 @@ Create a patch from STASH \(fn STASH)" t nil) (autoload 'magit-stash-list "magit-stash" "\ -List all stashes in a buffer. - -\(fn)" t nil) +List all stashes in a buffer." t nil) (autoload 'magit-stash-show "magit-stash" "\ Show all diffs of a stash in a buffer. @@ -2195,9 +2117,7 @@ and read the info node `(magit)Getting Started', which also contains other useful hints.") (autoload 'magit-status-here "magit-status" "\ -Like `magit-status' but with non-nil `magit-status-goto-file-position'. - -\(fn)" t nil) +Like `magit-status' but with non-nil `magit-status-goto-file-position'." t nil) (autoload 'magit-status-setup-buffer "magit-status" "\ @@ -2244,45 +2164,31 @@ to recover from making a mistake here, but don't count on it. Insert submodule sections. Hook `magit-module-sections-hook' controls which module sections are inserted, and option `magit-module-sections-nested' controls -whether they are wrapped in an additional section. - -\(fn)" nil nil) +whether they are wrapped in an additional section." nil nil) (autoload 'magit-insert-modules-overview "magit-submodule" "\ Insert sections for all modules. For each section insert the path and the output of `git describe --tags', -or, failing that, the abbreviated HEAD commit hash. - -\(fn)" nil nil) +or, failing that, the abbreviated HEAD commit hash." nil nil) (autoload 'magit-insert-modules-unpulled-from-upstream "magit-submodule" "\ Insert sections for modules that haven't been pulled from the upstream. -These sections can be expanded to show the respective commits. - -\(fn)" nil nil) +These sections can be expanded to show the respective commits." nil nil) (autoload 'magit-insert-modules-unpulled-from-pushremote "magit-submodule" "\ Insert sections for modules that haven't been pulled from the push-remote. -These sections can be expanded to show the respective commits. - -\(fn)" nil nil) +These sections can be expanded to show the respective commits." nil nil) (autoload 'magit-insert-modules-unpushed-to-upstream "magit-submodule" "\ Insert sections for modules that haven't been pushed to the upstream. -These sections can be expanded to show the respective commits. - -\(fn)" nil nil) +These sections can be expanded to show the respective commits." nil nil) (autoload 'magit-insert-modules-unpushed-to-pushremote "magit-submodule" "\ Insert sections for modules that haven't been pushed to the push-remote. -These sections can be expanded to show the respective commits. - -\(fn)" nil nil) +These sections can be expanded to show the respective commits." nil nil) (autoload 'magit-list-submodules "magit-submodule" "\ -Display a list of the current repository's submodules. - -\(fn)" t nil) +Display a list of the current repository's submodules." t nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-submodule" '("magit-"))) @@ -2391,9 +2297,7 @@ like \"/path/to/foo-bar\". (autoload 'magit-emacs-Q-command "magit-utils" "\ Show a shell command that runs an uncustomized Emacs with only Magit loaded. -See info node `(magit)Debugging Tools' for more information. - -\(fn)" t nil) +See info node `(magit)Debugging Tools' for more information." t nil) (autoload 'Info-follow-nearest-node--magit-gitman "magit-utils" "\ @@ -2429,6 +2333,11 @@ or call the function `magit-wip-mode'.") (autoload 'magit-wip-mode "magit-wip" "\ Save uncommitted changes to work-in-progress refs. +If called interactively, enable Magit-Wip mode if ARG is +positive, and disable it if ARG is zero or negative. If called +from Lisp, also enable the mode if ARG is omitted or nil, and +toggle it if ARG is `toggle'; disable the mode otherwise. + Whenever appropriate (i.e. when dataloss would be a possibility otherwise) this mode causes uncommitted changes to be committed to dedicated work-in-progress refs. @@ -2440,6 +2349,8 @@ but that is discouraged. \(fn &optional ARG)" t nil) +(put 'magit-wip-after-save-mode 'globalized-minor-mode t) + (defvar magit-wip-after-save-mode nil "\ Non-nil if Magit-Wip-After-Save mode is enabled. See the `magit-wip-after-save-mode' command @@ -2472,6 +2383,11 @@ for a description of this minor mode.") (autoload 'magit-wip-after-apply-mode "magit-wip" "\ Commit to work-in-progress refs. +If called interactively, enable Magit-Wip-After-Apply mode if ARG +is positive, and disable it if ARG is zero or negative. If +called from Lisp, also enable the mode if ARG is omitted or nil, +and toggle it if ARG is `toggle'; disable the mode otherwise. + After applying a change using any \"apply variant\" command (apply, stage, unstage, discard, and reverse) commit the affected files to the current wip refs. For each branch there @@ -2491,6 +2407,11 @@ for a description of this minor mode.") (autoload 'magit-wip-before-change-mode "magit-wip" "\ Commit to work-in-progress refs before certain destructive changes. +If called interactively, enable Magit-Wip-Before-Change mode if +ARG is positive, and disable it if ARG is zero or negative. If +called from Lisp, also enable the mode if ARG is omitted or nil, +and toggle it if ARG is `toggle'; disable the mode otherwise. + Before invoking a revert command or an \"apply variant\" command (apply, stage, unstage, discard, and reverse) commit the affected tracked files to the current wip refs. For each branch @@ -2517,9 +2438,7 @@ modes, instead of in a backup file as `backup-buffer' would. This function ignores the variables that affect `backup-buffer' and can be used along-side that function, which is recommended because this function only backs up files that are tracked in -a Git repository. - -\(fn)" nil nil) +a Git repository." nil nil) (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-wip" '("magit-"))) diff --git a/elpa/magit-20201116.1057/magit-autorevert.el b/elpa/magit-20210102.1019/magit-autorevert.el similarity index 100% rename from elpa/magit-20201116.1057/magit-autorevert.el rename to elpa/magit-20210102.1019/magit-autorevert.el diff --git a/elpa/magit-20201116.1057/magit-bisect.el b/elpa/magit-20210102.1019/magit-bisect.el similarity index 100% rename from elpa/magit-20201116.1057/magit-bisect.el rename to elpa/magit-20210102.1019/magit-bisect.el diff --git a/elpa/magit-20201116.1057/magit-blame.el b/elpa/magit-20210102.1019/magit-blame.el similarity index 99% rename from elpa/magit-20201116.1057/magit-blame.el rename to elpa/magit-20210102.1019/magit-blame.el index bb2f339d..651d5701 100644 --- a/elpa/magit-20201116.1057/magit-blame.el +++ b/elpa/magit-20210102.1019/magit-blame.el @@ -906,7 +906,7 @@ instead of the hash, like `kill-ring-save' would." ("q" "Quit blaming" magit-blame-quit)] ["Refresh" :if-non-nil magit-blame-mode - ("c" "Cycle style" magit-blame-cycle-style)]) + ("c" "Cycle style" magit-blame-cycle-style :transient t)]) (defun magit-blame-arguments () (transient-args 'magit-blame)) diff --git a/elpa/magit-20201116.1057/magit-bookmark.el b/elpa/magit-20210102.1019/magit-bookmark.el similarity index 100% rename from elpa/magit-20201116.1057/magit-bookmark.el rename to elpa/magit-20210102.1019/magit-bookmark.el diff --git a/elpa/magit-20201116.1057/magit-branch.el b/elpa/magit-20210102.1019/magit-branch.el similarity index 100% rename from elpa/magit-20201116.1057/magit-branch.el rename to elpa/magit-20210102.1019/magit-branch.el diff --git a/elpa/magit-20201116.1057/magit-clone.el b/elpa/magit-20210102.1019/magit-clone.el similarity index 100% rename from elpa/magit-20201116.1057/magit-clone.el rename to elpa/magit-20210102.1019/magit-clone.el diff --git a/elpa/magit-20201116.1057/magit-commit.el b/elpa/magit-20210102.1019/magit-commit.el similarity index 94% rename from elpa/magit-20201116.1057/magit-commit.el rename to elpa/magit-20210102.1019/magit-commit.el index 70755863..fea4928a 100644 --- a/elpa/magit-20201116.1057/magit-commit.el +++ b/elpa/magit-20210102.1019/magit-commit.el @@ -126,7 +126,8 @@ Also see `git-commit-post-finish-hook'." ("f" "Fixup" magit-commit-fixup) ("s" "Squash" magit-commit-squash) ("A" "Augment" magit-commit-augment) - (6 "x" "Absorb changes" magit-commit-autofixup)] + (6 "x" "Absorb changes" magit-commit-autofixup) + (6 "X" "Absorb modules" magit-commit-absorb-modules)] ["" ("F" "Instant fixup" magit-commit-instant-fixup) ("S" "Instant squash" magit-commit-instant-squash)]] @@ -414,6 +415,30 @@ history element." (and (magit-rev-author-p "HEAD") (concat "--date=" date))))) +;;;###autoload +(defun magit-commit-absorb-modules (phase commit) + "Spread modified modules across recent commits." + (interactive (list 'select (magit-get-upstream-branch))) + (let ((modules (magit-list-modified-modules))) + (unless modules + (user-error "There are no modified modules that could be absorbed")) + (when commit + (setq commit (magit-rebase-interactive-assert commit t))) + (if (and commit (eq phase 'run)) + (progn + (dolist (module modules) + (when-let ((msg (magit-git-string + "log" "-1" "--format=%s" + (concat commit "..") "--" module))) + (magit-git "commit" "-m" (concat "fixup! " msg) + "--only" "--" module))) + (magit-refresh) + t) + (magit-log-select + (lambda (commit) + (magit-commit-absorb-modules 'run commit)) + nil nil nil nil commit)))) + ;;;###autoload (autoload 'magit-commit-absorb "magit-commit" nil t) (transient-define-prefix magit-commit-absorb (phase commit args) "Spread staged changes across recent commits. @@ -455,10 +480,14 @@ See `magit-commit-autofixup' for an alternative implementation." ;;;###autoload (autoload 'magit-commit-autofixup "magit-commit" nil t) (transient-define-prefix magit-commit-autofixup (phase commit args) - "Spread unstaged changes across recent commits. -With a prefix argument use a transient command to select infix -arguments. This command requires the git-autofixup script, which -is available from https://github.com/torbiak/git-autofixup. + "Spread staged or unstaged changes across recent commits. + +If there are any staged then spread only those, otherwise +spread all unstaged changes. With a prefix argument use a +transient command to select infix arguments. + +This command requires the git-autofixup script, which is +available from https://github.com/torbiak/git-autofixup. See `magit-commit-absorb' for an alternative implementation." ["Arguments" (magit-autofixup:--context) @@ -475,10 +504,8 @@ See `magit-commit-absorb' for an alternative implementation." (unless (executable-find "git-autofixup") (user-error "This command requires the git-autofixup script, which %s" "is available from https://github.com/torbiak/git-autofixup")) - (when (magit-anything-staged-p) - (user-error "Cannot absorb when there are staged changes")) - (unless (magit-anything-unstaged-p) - (user-error "There are no unstaged changes that could be absorbed")) + (unless (magit-anything-modified-p) + (user-error "There are no changes that could be absorbed")) (when commit (setq commit (magit-rebase-interactive-assert commit t))) (if (and commit (eq phase 'run)) diff --git a/elpa/magit-20201116.1057/magit-core.el b/elpa/magit-20210102.1019/magit-core.el similarity index 100% rename from elpa/magit-20201116.1057/magit-core.el rename to elpa/magit-20210102.1019/magit-core.el diff --git a/elpa/magit-20201116.1057/magit-diff.el b/elpa/magit-20210102.1019/magit-diff.el similarity index 99% rename from elpa/magit-20201116.1057/magit-diff.el rename to elpa/magit-20210102.1019/magit-diff.el index 4a91c64b..f8d7849d 100644 --- a/elpa/magit-20201116.1057/magit-diff.el +++ b/elpa/magit-20210102.1019/magit-diff.el @@ -75,6 +75,7 @@ (defgroup magit-diff nil "Inspect and manipulate Git diffs." :link '(info-link "(magit)Diffing") + :group 'magit-commands :group 'magit-modes) (defcustom magit-diff-mode-hook nil @@ -1555,7 +1556,7 @@ Like `magit-diff-visit-worktree-file' but use (defun magit-diff-visit-file--internal (file force-worktree fn) "From a diff visit the appropriate version of FILE. If FORCE-WORKTREE is non-nil, then visit the worktree version of -the file, even if the diff is about a committed change. USE FN +the file, even if the diff is about a committed change. Use FN to display the buffer in some window." (if (magit-file-accessible-directory-p file) (magit-diff-visit-directory file force-worktree) @@ -2559,7 +2560,7 @@ or a ref which is not a branch, then it inserts nothing." (eq magit-revision-insert-related-refs 'all)) (magit--insert-related-refs magit-buffer-revision "--contains" "Contained" - (eq magit-revision-insert-related-refs '(all mixed))) + (memq magit-revision-insert-related-refs '(all mixed))) (when-let ((follows (magit-get-current-tag magit-buffer-revision t))) (let ((tag (car follows)) (cnt (cadr follows))) diff --git a/elpa/magit-20201116.1057/magit-ediff.el b/elpa/magit-20210102.1019/magit-ediff.el similarity index 100% rename from elpa/magit-20201116.1057/magit-ediff.el rename to elpa/magit-20210102.1019/magit-ediff.el diff --git a/elpa/magit-20201116.1057/magit-extras.el b/elpa/magit-20210102.1019/magit-extras.el similarity index 92% rename from elpa/magit-20201116.1057/magit-extras.el rename to elpa/magit-20210102.1019/magit-extras.el index 132de58b..dca43c27 100644 --- a/elpa/magit-20201116.1057/magit-extras.el +++ b/elpa/magit-20210102.1019/magit-extras.el @@ -32,6 +32,7 @@ (declare-function dired-read-shell-command "dired-aux" (prompt arg files)) ;; For `magit-project-status'. (declare-function project-root "project" (project)) +(declare-function vc-git-command "vc-git" (buffer okstatus file-or-list &rest flags)) (defvar ido-exit) (defvar ido-fallback) @@ -268,6 +269,44 @@ with two prefix arguments remove ignored files only. ;;; ChangeLog +(defun magit-generate-changelog (&optional amending) + "Insert ChangeLog entries into the current buffer. + +The entries are generated from the diff being committed. +If prefix argument, AMENDING, is non-nil, include changes +in HEAD as well as staged changes in the diff to check." + (interactive "P") + (unless (magit-commit-message-buffer) + (user-error "No commit in progress")) + (require 'diff-mode) ; `diff-add-log-current-defuns'. + (require 'vc-git) ; `vc-git-diff'. + (require 'add-log) ; `change-log-insert-entries'. + (unless (and (fboundp 'change-log-insert-entries) + (fboundp 'diff-add-log-current-defuns)) + (user-error "`magit-generate-changelog' requires Emacs 27 or better")) + (setq default-directory + (if (and (file-regular-p "gitdir") + (not (magit-git-true "rev-parse" "--is-inside-work-tree")) + (magit-git-true "rev-parse" "--is-inside-git-dir")) + (file-name-directory (magit-file-line "gitdir")) + (magit-toplevel))) + (let ((rev1 (if amending "HEAD^1" "HEAD")) + (rev2 nil)) + ;; Magit may have updated the files without notifying vc, but + ;; `diff-add-log-current-defuns' relies on vc being up-to-date. + (mapc #'vc-file-clearprops (magit-staged-files)) + (change-log-insert-entries + (with-temp-buffer + (vc-git-command (current-buffer) 1 nil + "diff-index" "--exit-code" "--patch" + (and (magit-anything-staged-p) "--cached") + rev1 "--") + ;; `diff-find-source-location' consults these vars. + (defvar diff-vc-revisions) + (setq-local diff-vc-revisions (list rev1 rev2)) + (setq-local diff-vc-backend 'Git) + (diff-add-log-current-defuns))))) + ;;;###autoload (defun magit-add-change-log-entry (&optional whoami file-name other-window) "Find change log file and add date entry and item for current change. @@ -583,7 +622,7 @@ the minibuffer too." (kbd "C-c C-w") 'magit-pop-revision-stack) ;;;###autoload -(defun magit-copy-section-value () +(defun magit-copy-section-value (arg) "Save the value of the current section for later use. Save the section value to the `kill-ring', and, provided that @@ -601,17 +640,23 @@ argument is used, then save the revision at its tip to the When the region is active, then save that to the `kill-ring', like `kill-ring-save' would, instead of behaving as described -above. If a prefix argument is used and the region is within a -hunk, strip the outer diff marker column." - (interactive) +above. If a prefix argument is used and the region is within +a hunk, then strip the diff marker column and keep only either +the added or removed lines, depending on the sign of the prefix +argument." + (interactive "P") (cond - ((and current-prefix-arg + ((and arg (magit-section-internal-region-p) (magit-section-match 'hunk)) - (kill-new (replace-regexp-in-string - "^[ \\+\\-]" "" - (buffer-substring-no-properties - (region-beginning) (region-end)))) + (kill-new + (thread-last (buffer-substring-no-properties + (region-beginning) + (region-end)) + (replace-regexp-in-string + (format "^\\%c.*\n?" (if (< (prefix-numeric-value arg) 0) ?+ ?-)) + "") + (replace-regexp-in-string "^[ \\+\\-]" ""))) (deactivate-mark)) ((use-region-p) (call-interactively #'copy-region-as-kill)) diff --git a/elpa/magit-20201116.1057/magit-fetch.el b/elpa/magit-20210102.1019/magit-fetch.el similarity index 100% rename from elpa/magit-20201116.1057/magit-fetch.el rename to elpa/magit-20210102.1019/magit-fetch.el diff --git a/elpa/magit-20201116.1057/magit-files.el b/elpa/magit-20210102.1019/magit-files.el similarity index 100% rename from elpa/magit-20201116.1057/magit-files.el rename to elpa/magit-20210102.1019/magit-files.el diff --git a/elpa/magit-20201116.1057/magit-git.el b/elpa/magit-20210102.1019/magit-git.el similarity index 99% rename from elpa/magit-20201116.1057/magit-git.el rename to elpa/magit-20210102.1019/magit-git.el index 76b5f942..a5a254d8 100644 --- a/elpa/magit-20201116.1057/magit-git.el +++ b/elpa/magit-20210102.1019/magit-git.el @@ -1386,12 +1386,13 @@ configured remote is an url, or the named branch does not exist, then return nil. I.e. return the name of an existing local or remote-tracking branch. The returned string is colorized according to the branch type." - (when-let ((branch (or branch (magit-get-current-branch))) - (upstream (magit-ref-abbrev (concat branch "@{upstream}")))) - (magit--propertize-face - upstream (if (equal (magit-get "branch" branch "remote") ".") - 'magit-branch-local - 'magit-branch-remote)))) + (magit--with-refresh-cache (list 'magit-get-upstream-branch branch) + (when-let ((branch (or branch (magit-get-current-branch))) + (upstream (magit-ref-abbrev (concat branch "@{upstream}")))) + (magit--propertize-face + upstream (if (equal (magit-get "branch" branch "remote") ".") + 'magit-branch-local + 'magit-branch-remote))))) (defun magit-get-indirect-upstream-branch (branch &optional force) (let ((remote (magit-get "branch" branch "remote"))) @@ -1455,12 +1456,13 @@ according to the branch type." (magit--propertize-face remote 'magit-branch-remote))) (defun magit-get-push-branch (&optional branch verify) - (when-let ((branch (or branch (setq branch (magit-get-current-branch)))) - (remote (magit-get-push-remote branch)) - (target (concat remote "/" branch))) - (and (or (not verify) - (magit-rev-verify target)) - (magit--propertize-face target 'magit-branch-remote)))) + (magit--with-refresh-cache (list 'magit-get-push-branch branch verify) + (when-let ((branch (or branch (setq branch (magit-get-current-branch)))) + (remote (magit-get-push-remote branch)) + (target (concat remote "/" branch))) + (and (or (not verify) + (magit-rev-verify target)) + (magit--propertize-face target 'magit-branch-remote))))) (defun magit-get-@{push}-branch (&optional branch) (let ((ref (magit-rev-parse "--symbolic-full-name" @@ -1711,6 +1713,11 @@ SORTBY is a key or list of keys to pass to the `--sort' flag of (substring it 41)) (magit-git-lines "ls-remote" remote))) +(defun magit-list-modified-modules () + (--keep (and (string-match "\\`\\+\\([^ ]+\\) \\(.+\\) (.+)\\'" it) + (match-string 2 it)) + (magit-git-lines "submodule" "status"))) + (defun magit-list-module-paths () (--mapcat (and (string-match "^160000 [0-9a-z]\\{40\\} 0\t\\(.+\\)$" it) (list (match-string 1 it))) diff --git a/elpa/magit-20201116.1057/magit-gitignore.el b/elpa/magit-20210102.1019/magit-gitignore.el similarity index 100% rename from elpa/magit-20201116.1057/magit-gitignore.el rename to elpa/magit-20210102.1019/magit-gitignore.el diff --git a/elpa/magit-20201116.1057/magit-imenu.el b/elpa/magit-20210102.1019/magit-imenu.el similarity index 100% rename from elpa/magit-20201116.1057/magit-imenu.el rename to elpa/magit-20210102.1019/magit-imenu.el diff --git a/elpa/magit-20201116.1057/magit-log.el b/elpa/magit-20210102.1019/magit-log.el similarity index 97% rename from elpa/magit-20201116.1057/magit-log.el rename to elpa/magit-20210102.1019/magit-log.el index 8b0016e1..e166eb20 100644 --- a/elpa/magit-20201116.1057/magit-log.el +++ b/elpa/magit-20210102.1019/magit-log.el @@ -62,6 +62,7 @@ (defgroup magit-log nil "Inspect and manipulate Git history." :link '(info-link "(magit)Logging") + :group 'magit-commands :group 'magit-modes) (defcustom magit-log-mode-hook nil @@ -455,7 +456,9 @@ the upstream isn't ahead of the current branch) show." (magit--any-wip-mode-enabled-p)) :description "Wiplog" ("i" "index" magit-wip-log-index) - ("w" "worktree" magit-wip-log-worktree)]]) + ("w" "worktree" magit-wip-log-worktree)] + ["Other" + (5 "s" "shortlog" magit-shortlog)]]) ;;;###autoload (autoload 'magit-log-refresh "magit-log" nil t) (transient-define-prefix magit-log-refresh () @@ -873,6 +876,48 @@ is displayed in the current frame." "\\[magit-log-double-commit-limit] first")))) (user-error "Parent %s does not exist" parent-rev)))))) +;;;; Shortlog Commands + +;;;###autoload (autoload 'magit-shortlog "magit-log" nil t) +(transient-define-prefix magit-shortlog () + "Show a history summary." + :man-page "git-shortlog" + :value '("--numbered" "--summary") + ["Arguments" + ("-n" "Sort by number of commits" ("-n" "--numbered")) + ("-s" "Show commit count summary only" ("-s" "--summary")) + ("-e" "Show email addresses" ("-e" "--email")) + ("-g" "Group commits by" "--group=" + :choices ("author" "committer" "trailer:")) + (7 "-f" "Format string" "--format=") + (7 "-w" "Linewrap" "-w" :class transient-option)] + ["Shortlog" + ("s" "since" magit-shortlog-since) + ("r" "range" magit-shortlog-range)]) + +(defun magit-git-shortlog (rev args) + (with-current-buffer (get-buffer-create "*magit-shortlog*") + (erase-buffer) + (save-excursion + (magit-git-insert "shortlog" args rev)) + (switch-to-buffer-other-window (current-buffer)))) + +;;;###autoload +(defun magit-shortlog-since (rev args) + "Show a history summary for commits since REV." + (interactive + (list (magit-read-branch-or-commit "Shortlog since" (magit-get-current-tag)) + (transient-args 'magit-shortlog))) + (magit-git-shortlog (concat rev "..") args)) + +;;;###autoload +(defun magit-shortlog-range (rev-or-range args) + "Show a history summary for commit or range REV-OR-RANGE." + (interactive + (list (magit-read-range-or-commit "Shortlog for revision or range") + (transient-args 'magit-shortlog))) + (magit-git-shortlog rev-or-range args)) + ;;; Log Mode (defvar magit-log-disable-graph-hack-args @@ -1661,12 +1706,7 @@ Type \\[magit-cherry-pick] to apply the commit at point. (defun magit-insert-unpulled-from-pushremote () "Insert commits that haven't been pulled from the push-remote yet." (--when-let (magit-get-push-branch) - (unless (and (equal (magit-rev-name it) - (magit-rev-name "@{upstream}")) - (or (memq 'magit-insert-unpulled-from-upstream - magit-status-sections-hook) - (memq 'magit-insert-unpulled-from-upstream-or-recent - magit-status-sections-hook))) + (when (magit--insert-pushremote-log-p) (magit-insert-section (unpulled (concat ".." it) t) (magit-insert-heading (format (propertize "Unpulled from %s." @@ -1730,12 +1770,7 @@ Show the last `magit-log-section-commit-count' commits." (defun magit-insert-unpushed-to-pushremote () "Insert commits that haven't been pushed to the push-remote yet." (--when-let (magit-get-push-branch) - (unless (and (equal (magit-rev-name it) - (magit-rev-name "@{upstream}")) - (or (memq 'magit-insert-unpushed-to-upstream - magit-status-sections-hook) - (memq 'magit-insert-unpushed-to-upstream-or-recent - magit-status-sections-hook))) + (when (magit--insert-pushremote-log-p) (magit-insert-section (unpushed (concat it "..") t) (magit-insert-heading (format (propertize "Unpushed to %s." @@ -1744,6 +1779,15 @@ Show the last `magit-log-section-commit-count' commits." (magit-insert-log (concat it "..") magit-buffer-log-args) (magit-log-insert-child-count))))) +(defun magit--insert-pushremote-log-p () + (magit--with-refresh-cache 'magit--insert-pushremote-log-p + (not (and (equal (magit-get-push-branch) + (magit-get-upstream-branch)) + (or (memq 'magit-insert-unpulled-from-upstream + magit-status-sections-hook) + (memq 'magit-insert-unpulled-from-upstream-or-recent + magit-status-sections-hook)))))) + (defun magit-log-insert-child-count () (when magit-section-show-child-count (let ((count (length (oref magit-insert-section--current children)))) diff --git a/elpa/magit-20201116.1057/magit-margin.el b/elpa/magit-20210102.1019/magit-margin.el similarity index 100% rename from elpa/magit-20201116.1057/magit-margin.el rename to elpa/magit-20210102.1019/magit-margin.el diff --git a/elpa/magit-20201116.1057/magit-merge.el b/elpa/magit-20210102.1019/magit-merge.el similarity index 97% rename from elpa/magit-20201116.1057/magit-merge.el rename to elpa/magit-20210102.1019/magit-merge.el index 31b228ad..4213d605 100644 --- a/elpa/magit-20201116.1057/magit-merge.el +++ b/elpa/magit-20210102.1019/magit-merge.el @@ -47,6 +47,7 @@ ("-f" "Fast-forward only" "--ff-only") ("-n" "No fast-forward" "--no-ff") (magit-merge:--strategy) + (5 magit-merge:--strategy-option) (5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=") (5 magit:--gpg-sign)] ["Actions" @@ -78,6 +79,13 @@ :argument "--strategy=" :choices '("resolve" "recursive" "octopus" "ours" "subtree")) +(transient-define-argument magit-merge:--strategy-option () + :description "Strategy Option" + :class 'transient-option + :key "-X" + :argument "--strategy-option=" + :choices '("ours" "theirs" "patience")) + ;;;###autoload (defun magit-merge-plain (rev &optional args nocommit) "Merge commit REV into the current branch; using default message. diff --git a/elpa/magit-20201116.1057/magit-mode.el b/elpa/magit-20210102.1019/magit-mode.el similarity index 97% rename from elpa/magit-20201116.1057/magit-mode.el rename to elpa/magit-20210102.1019/magit-mode.el index 787da27e..c7897b3d 100644 --- a/elpa/magit-20201116.1057/magit-mode.el +++ b/elpa/magit-20210102.1019/magit-mode.el @@ -235,6 +235,8 @@ and Buffer Arguments'." :package-version '(magit . "3.0.0") :group 'magit-buffers :group 'magit-commands + :group 'magit-diff + :group 'magit-log :type '(choice (const :tag "always use args from buffer" always) (const :tag "use args from buffer if displayed in frame" selected) @@ -266,6 +268,8 @@ and Buffer Arguments'." :package-version '(magit . "3.0.0") :group 'magit-buffers :group 'magit-commands + :group 'magit-diff + :group 'magit-log :type '(choice (const :tag "always use args from buffer" always) (const :tag "use args from buffer if displayed in frame" selected) @@ -1033,11 +1037,11 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'." (magit-run-hook-with-benchmark 'magit-post-unstage-hook))) (magit-run-hook-with-benchmark 'magit-post-refresh-hook) (when magit-refresh-verbose - (message "Refreshing magit...done (%.3fs, cached %s/%s)" - (float-time (time-subtract (current-time) start)) - (caar magit--refresh-cache) - (+ (caar magit--refresh-cache) - (cdar magit--refresh-cache))))) + (let* ((c (caar magit--refresh-cache)) + (a (+ c (cdar magit--refresh-cache)))) + (message "Refreshing magit...done (%.3fs, cached %s/%s (%.0f%%))" + (float-time (time-subtract (current-time) start)) + c a (* (/ c (* a 1.0)) 100))))) (run-hooks 'magit-unwind-refresh-hook)))) (defun magit-refresh-all () @@ -1344,15 +1348,15 @@ then the value is not cached, and we return nil." (defun magit-repository-local-exists-p (key &optional repository) "Non-nil when a repository-local value exists for KEY. -Returns a (KEY . value) cons cell. +Return a (KEY . VALUE) cons cell. The KEY is matched using `equal'. Unless specified, REPOSITORY is the current buffer's repository." - (let* ((repokey (or repository (magit-repository-local-repository))) - (cache (assoc repokey magit-repository-local-cache))) - (and cache - (assoc key (cdr cache))))) + (when-let ((cache (assoc (or repository + (magit-repository-local-repository)) + magit-repository-local-cache))) + (assoc key (cdr cache)))) (defun magit-repository-local-get (key &optional default repository) "Return the repository-local value for KEY. @@ -1362,21 +1366,30 @@ Return DEFAULT if no value for KEY exists. The KEY is matched using `equal'. Unless specified, REPOSITORY is the current buffer's repository." - (let ((keyvalue (magit-repository-local-exists-p key repository))) - (if keyvalue - (cdr keyvalue) - default))) + (if-let ((keyvalue (magit-repository-local-exists-p key repository))) + (cdr keyvalue) + default)) (defun magit-repository-local-delete (key &optional repository) "Delete the repository-local value for KEY. Unless specified, REPOSITORY is the current buffer's repository." - (let* ((repokey (or repository (magit-repository-local-repository))) - (cache (assoc repokey magit-repository-local-cache))) - (when cache - ;; There is no `assoc-delete-all'. - (setf (cdr cache) - (cl-delete key (cdr cache) :key #'car :test #'equal))))) + (when-let ((cache (assoc (or repository + (magit-repository-local-repository)) + magit-repository-local-cache))) + ;; There is no `assoc-delete-all'. + (setf (cdr cache) + (cl-delete key (cdr cache) :key #'car :test #'equal)))) + +(defmacro magit--with-repository-local-cache (key &rest body) + (declare (indent 1) (debug (form body))) + (let ((k (cl-gensym))) + `(let ((,k ,key)) + (if-let ((kv (magit-repository-local-exists-p ,k))) + (cdr kv) + (let ((v ,(macroexp-progn body))) + (magit-repository-local-set ,k v) + v))))) (defun magit-preserve-section-visibility-cache () (when (derived-mode-p 'magit-status-mode 'magit-refs-mode) diff --git a/elpa/magit-20201116.1057/magit-notes.el b/elpa/magit-20210102.1019/magit-notes.el similarity index 100% rename from elpa/magit-20201116.1057/magit-notes.el rename to elpa/magit-20210102.1019/magit-notes.el diff --git a/elpa/magit-20201116.1057/magit-obsolete.el b/elpa/magit-20210102.1019/magit-obsolete.el similarity index 100% rename from elpa/magit-20201116.1057/magit-obsolete.el rename to elpa/magit-20210102.1019/magit-obsolete.el diff --git a/elpa/magit-20201116.1057/magit-patch.el b/elpa/magit-20210102.1019/magit-patch.el similarity index 96% rename from elpa/magit-20201116.1057/magit-patch.el rename to elpa/magit-20210102.1019/magit-patch.el index 384bcb66..7b25dda5 100644 --- a/elpa/magit-20201116.1057/magit-patch.el +++ b/elpa/magit-20210102.1019/magit-patch.el @@ -119,15 +119,13 @@ which creates patches for all commits that are reachable from (save-match-data (find-file (expand-file-name - (concat (--some (and (string-match "\\`--reroll-count=\\(.+\\)" it) - (format "v%s-" (match-string 1 it))) - args) + (concat (when-let ((v (transient-arg-value "--reroll-count=" args))) + (format "v%s-" v)) "0000-cover-letter.patch") (let ((topdir (magit-toplevel))) - (or (--some (and (string-match "\\`--output-directory=\\(.+\\)" it) - (expand-file-name (match-string 1 it) topdir)) - args) - topdir)))))))) + (if-let ((dir (transient-arg-value "--output-directory=" args))) + (expand-file-name dir topdir) + topdir)))))))) (transient-define-argument magit-format-patch:--in-reply-to () :description "In reply to" diff --git a/elpa/magit-20210102.1019/magit-pkg.el b/elpa/magit-20210102.1019/magit-pkg.el new file mode 100644 index 00000000..2816bf57 --- /dev/null +++ b/elpa/magit-20210102.1019/magit-pkg.el @@ -0,0 +1,17 @@ +(define-package "magit" "20210102.1019" "A Git porcelain inside Emacs." + '((emacs "25.1") + (async "20200113") + (dash "20200524") + (git-commit "20200516") + (transient "20200601") + (with-editor "20200522")) + :commit "f3602d5f98ffdb548a629e171095cbc835faba73" :authors + (("Marius Vollmer" . "marius.vollmer@gmail.com")) + :maintainer + ("Jonas Bernoulli" . "jonas@bernoul.li") + :keywords + ("git" "tools" "vc") + :url "https://github.com/magit/magit") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/magit-20201116.1057/magit-process.el b/elpa/magit-20210102.1019/magit-process.el similarity index 100% rename from elpa/magit-20201116.1057/magit-process.el rename to elpa/magit-20210102.1019/magit-process.el diff --git a/elpa/magit-20201116.1057/magit-pull.el b/elpa/magit-20210102.1019/magit-pull.el similarity index 100% rename from elpa/magit-20201116.1057/magit-pull.el rename to elpa/magit-20210102.1019/magit-pull.el diff --git a/elpa/magit-20201116.1057/magit-push.el b/elpa/magit-20210102.1019/magit-push.el similarity index 95% rename from elpa/magit-20201116.1057/magit-push.el rename to elpa/magit-20210102.1019/magit-push.el index 131a9ff9..68ca3120 100644 --- a/elpa/magit-20201116.1057/magit-push.el +++ b/elpa/magit-20210102.1019/magit-push.el @@ -87,8 +87,12 @@ argument the push-remote can be changed before pushed to it." :if 'magit-get-current-branch :description 'magit-push--pushbranch-description (interactive (list (magit-push-arguments))) - (pcase-let ((`(,branch ,remote) + (pcase-let ((`(,branch ,remote ,changed) (magit--select-push-remote "push there"))) + (when changed + (magit-confirm 'set-and-push + (format "Really use \"%s\" as push-remote and push \"%s\" there" + remote branch))) (run-hooks 'magit-credential-hook) (magit-run-git-async "push" "-v" args remote (format "refs/heads/%s:refs/heads/%s" @@ -136,16 +140,19 @@ the upstream." branches nil nil nil 'magit-revision-history (or (car (member (magit-remote-branch-at-point) branches)) (car (member "origin/master" branches))))) - (upstream (or (magit-get-tracked upstream) - (magit-split-branch-name upstream)))) - (setq remote (car upstream)) - (setq merge (cdr upstream)) + (upstream* (or (magit-get-tracked upstream) + (magit-split-branch-name upstream)))) + (setq remote (car upstream*)) + (setq merge (cdr upstream*)) (unless (string-prefix-p "refs/" merge) ;; User selected a non-existent remote-tracking branch. ;; It is very likely, but not certain, that this is the ;; correct thing to do. It is even more likely that it ;; is what the user wants to happen. - (setq merge (concat "refs/heads/" merge)))) + (setq merge (concat "refs/heads/" merge))) + (magit-confirm 'set-and-push + (format "Really use \"%s\" as upstream and push \"%s\" there" + upstream branch))) (cl-pushnew "--set-upstream" args :test #'equal)) (run-hooks 'magit-credential-hook) (magit-run-git-async "push" "-v" args remote (concat branch ":" merge)))) diff --git a/elpa/magit-20201116.1057/magit-reflog.el b/elpa/magit-20210102.1019/magit-reflog.el similarity index 100% rename from elpa/magit-20201116.1057/magit-reflog.el rename to elpa/magit-20210102.1019/magit-reflog.el diff --git a/elpa/magit-20201116.1057/magit-refs.el b/elpa/magit-20210102.1019/magit-refs.el similarity index 100% rename from elpa/magit-20201116.1057/magit-refs.el rename to elpa/magit-20210102.1019/magit-refs.el diff --git a/elpa/magit-20201116.1057/magit-remote.el b/elpa/magit-20210102.1019/magit-remote.el similarity index 99% rename from elpa/magit-20201116.1057/magit-remote.el rename to elpa/magit-20210102.1019/magit-remote.el index 5d2bf804..1bc5e0e1 100644 --- a/elpa/magit-20201116.1057/magit-remote.el +++ b/elpa/magit-20210102.1019/magit-remote.el @@ -332,16 +332,18 @@ Delete the symbolic-ref \"refs/remotes//HEAD\"." (defun magit--select-push-remote (prompt-suffix) (let* ((branch (or (magit-get-current-branch) (user-error "No branch is checked out"))) - (remote (magit-get-push-remote branch))) + (remote (magit-get-push-remote branch)) + (changed nil)) (when (or current-prefix-arg (not remote) (not (member remote (magit-list-remotes)))) + (setq changed t) (setq remote (magit-read-remote (format "Set %s and %s" (magit--push-remote-variable) prompt-suffix))) (setf (magit-get (magit--push-remote-variable branch)) remote)) - (list branch remote))) + (list branch remote changed))) ;;; _ (provide 'magit-remote) diff --git a/elpa/magit-20201116.1057/magit-repos.el b/elpa/magit-20210102.1019/magit-repos.el similarity index 100% rename from elpa/magit-20201116.1057/magit-repos.el rename to elpa/magit-20210102.1019/magit-repos.el diff --git a/elpa/magit-20201116.1057/magit-reset.el b/elpa/magit-20210102.1019/magit-reset.el similarity index 100% rename from elpa/magit-20201116.1057/magit-reset.el rename to elpa/magit-20210102.1019/magit-reset.el diff --git a/elpa/magit-20201116.1057/magit-section.el b/elpa/magit-20210102.1019/magit-section.el similarity index 99% rename from elpa/magit-20201116.1057/magit-section.el rename to elpa/magit-20210102.1019/magit-section.el index 0a21bf20..98f225bb 100644 --- a/elpa/magit-20201116.1057/magit-section.el +++ b/elpa/magit-20210102.1019/magit-section.el @@ -1503,13 +1503,17 @@ invisible." (goto-char beg) (let ((section (magit-current-section))) (while section - (if (and (magit-section-invisible-p section) - (<= (oref section content) beg (oref section end))) - (progn - (magit-section-show section) - (push section magit-section--opened-sections) - (setq section (oref section parent))) - (setq section nil))))) + (let ((content (oref section content))) + (if (and (magit-section-invisible-p section) + (<= (or content (oref section start)) + beg + (oref section end))) + (progn + (when content + (magit-section-show section) + (push section magit-section--opened-sections)) + (setq section (oref section parent))) + (setq section nil)))))) (or (eq search-invisible t) (not (isearch-range-invisible beg end)))) @@ -1747,8 +1751,11 @@ Configuration'." magit--current-section-hook))) (unless (memq entry magit-disabled-section-inserters) (if (bound-and-true-p magit-refresh-verbose) - (message " %-50s %s" entry - (benchmark-elapse (apply entry args))) + (let ((time (benchmark-elapse (apply entry args)))) + (message " %-50s %s %s" entry time + (cond ((> time 0.03) "!!") + ((> time 0.01) "!") + (t "")))) (apply entry args))))))) (cl-defun magit--overlay-at (pos prop &optional (val nil sval) testfn) diff --git a/elpa/magit-20201116.1057/magit-sequence.el b/elpa/magit-20210102.1019/magit-sequence.el similarity index 99% rename from elpa/magit-20201116.1057/magit-sequence.el rename to elpa/magit-20210102.1019/magit-sequence.el index 3ae6bcb5..6ca0e9de 100644 --- a/elpa/magit-20201116.1057/magit-sequence.el +++ b/elpa/magit-20210102.1019/magit-sequence.el @@ -503,6 +503,8 @@ This discards all changes made since the sequence started." ("-k" "Keep empty commits" "--keep-empty") ("-p" "Preserve merges" ("-p" "--preserve-merges")) (7 magit-merge:--strategy) + (7 magit-merge:--strategy-option) + (7 "=X" magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=") ("-d" "Lie about committer date" "--committer-date-is-author-date") ("-a" "Autosquash" "--autosquash") ("-A" "Autostash" "--autostash") diff --git a/elpa/magit-20201116.1057/magit-stash.el b/elpa/magit-20210102.1019/magit-stash.el similarity index 100% rename from elpa/magit-20201116.1057/magit-stash.el rename to elpa/magit-20210102.1019/magit-stash.el diff --git a/elpa/magit-20201116.1057/magit-status.el b/elpa/magit-20210102.1019/magit-status.el similarity index 100% rename from elpa/magit-20201116.1057/magit-status.el rename to elpa/magit-20210102.1019/magit-status.el diff --git a/elpa/magit-20201116.1057/magit-submodule.el b/elpa/magit-20210102.1019/magit-submodule.el similarity index 100% rename from elpa/magit-20201116.1057/magit-submodule.el rename to elpa/magit-20210102.1019/magit-submodule.el diff --git a/elpa/magit-20201116.1057/magit-subtree.el b/elpa/magit-20210102.1019/magit-subtree.el similarity index 100% rename from elpa/magit-20201116.1057/magit-subtree.el rename to elpa/magit-20210102.1019/magit-subtree.el diff --git a/elpa/magit-20201116.1057/magit-tag.el b/elpa/magit-20210102.1019/magit-tag.el similarity index 100% rename from elpa/magit-20201116.1057/magit-tag.el rename to elpa/magit-20210102.1019/magit-tag.el diff --git a/elpa/magit-20201116.1057/magit-transient.el b/elpa/magit-20210102.1019/magit-transient.el similarity index 100% rename from elpa/magit-20201116.1057/magit-transient.el rename to elpa/magit-20210102.1019/magit-transient.el diff --git a/elpa/magit-20201116.1057/magit-utils.el b/elpa/magit-20210102.1019/magit-utils.el similarity index 99% rename from elpa/magit-20201116.1057/magit-utils.el rename to elpa/magit-20210102.1019/magit-utils.el index eb181a7c..11d0bcfa 100644 --- a/elpa/magit-20201116.1057/magit-utils.el +++ b/elpa/magit-20210102.1019/magit-utils.el @@ -163,6 +163,7 @@ The value has the form ((COMMAND nil|PROMPT DEFAULT)...). (const delete-unmerged-branch) (const delete-pr-remote) (const drop-stashes) + (const set-and-push) (const amend-published) (const rebase-published) (const edit-published) @@ -172,7 +173,7 @@ The value has the form ((COMMAND nil|PROMPT DEFAULT)...). (const kill-process) (const safe-with-wip))) -(defcustom magit-no-confirm nil +(defcustom magit-no-confirm '(set-and-push) "A list of symbols for actions Magit should not confirm, or t. Many potentially dangerous commands by default ask the user for @@ -255,6 +256,15 @@ References: This action only concerns the deletion of multiple stashes at once. +Publishing: + + `set-and-push' When pushing to the upstream or the push-remote + and that isn't actually configured yet, then the user can first + set the target. If s/he confirms the default too quickly, then + s/he might end up pushing to the wrong branch and if the remote + repository is configured to disallow fixing such mistakes, then + that can be quite embarrassing and annoying. + Edit published history: Without adding these symbols here, you will be warned before diff --git a/elpa/magit-20201116.1057/magit-wip.el b/elpa/magit-20210102.1019/magit-wip.el similarity index 100% rename from elpa/magit-20201116.1057/magit-wip.el rename to elpa/magit-20210102.1019/magit-wip.el diff --git a/elpa/magit-20201116.1057/magit-worktree.el b/elpa/magit-20210102.1019/magit-worktree.el similarity index 100% rename from elpa/magit-20201116.1057/magit-worktree.el rename to elpa/magit-20210102.1019/magit-worktree.el diff --git a/elpa/magit-20201116.1057/magit.el b/elpa/magit-20210102.1019/magit.el similarity index 99% rename from elpa/magit-20201116.1057/magit.el rename to elpa/magit-20210102.1019/magit.el index e672c0d5..720d7376 100644 --- a/elpa/magit-20201116.1057/magit.el +++ b/elpa/magit-20210102.1019/magit.el @@ -287,6 +287,7 @@ Also see info node `(magit)Commands for Buffers Visiting Files'." ;;;###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" ["Transient and dwim commands" [("A" "Apply" magit-cherry-pick) ("b" "Branch" magit-branch) diff --git a/elpa/magit-20210102.1019/magit.info b/elpa/magit-20210102.1019/magit.info new file mode 100644 index 00000000..c6efd81c --- /dev/null +++ b/elpa/magit-20210102.1019/magit.info @@ -0,0 +1,195 @@ +This is magit.info, produced by makeinfo version 6.5 from magit.texi. + + Copyright (C) 2015-2021 Jonas Bernoulli + + You can redistribute this document and/or modify it under the terms + of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) + any later version. + + This document is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + +INFO-DIR-SECTION Emacs +START-INFO-DIR-ENTRY +* Magit: (magit). Using Git from Emacs with Magit. +END-INFO-DIR-ENTRY + + +Indirect: +magit.info-1: 754 +magit.info-2: 301254 + +Tag Table: +(Indirect) +Node: Top754 +Node: Introduction6512 +Node: Installation11235 +Node: Installing from Melpa11565 +Node: Installing from the Git Repository12638 +Node: Post-Installation Tasks15370 +Node: Getting Started16655 +Node: Interface Concepts21895 +Node: Modes and Buffers22256 +Node: Switching Buffers24005 +Node: Naming Buffers28756 +Node: Quitting Windows32063 +Node: Automatic Refreshing of Magit Buffers33809 +Node: Automatic Saving of File-Visiting Buffers36661 +Node: Automatic Reverting of File-Visiting Buffers37846 +Node: Risk of Reverting Automatically42841 +Node: Sections45223 +Node: Section Movement46149 +Node: Section Visibility51059 +Node: Section Hooks57136 +Node: Section Types and Values59543 +Node: Section Options60846 +Node: Transient Commands61318 +Node: Transient Arguments and Buffer Variables62555 +Node: Completion Confirmation and the Selection69573 +Node: Action Confirmation70017 +Node: Completion and Confirmation77833 +Node: The Selection81019 +Node: The hunk-internal region83918 +Node: Support for Completion Frameworks85007 +Node: Additional Completion Options89914 +Node: Running Git90513 +Node: Viewing Git Output90786 +Node: Git Process Status91919 +Node: Running Git Manually92884 +Node: Git Executable95354 +Node: Global Git Arguments97636 +Node: Inspecting98442 +Node: Status Buffer99599 +Node: Status Sections103589 +Node: Status Header Sections109141 +Node: Status Module Sections111771 +Node: Status Options114276 +Node: Repository List115745 +Node: Logging118783 +Node: Refreshing Logs121344 +Node: Log Buffer122790 +Node: Log Margin126646 +Node: Select from Log129825 +Node: Reflog132050 +Node: Cherries133707 +Node: Diffing135555 +Node: Refreshing Diffs138634 +Node: Commands Available in Diffs142213 +Node: Diff Options144749 +Node: Revision Buffer149787 +Node: Ediffing153117 +Node: References Buffer156765 +Node: References Sections167285 +Node: Bisecting168146 +Node: Visiting Files and Blobs169959 +Node: General-Purpose Visit Commands170429 +Node: Visiting Files and Blobs from a Diff171385 +Node: Blaming174844 +Node: Manipulating181185 +Node: Creating Repository181527 +Node: Cloning Repository182082 +Node: Staging and Unstaging187487 +Node: Staging from File-Visiting Buffers191570 +Node: Applying192738 +Node: Committing194631 +Node: Initiating a Commit195214 +Node: Editing Commit Messages198599 +Node: Using the Revision Stack201402 +Node: Commit Pseudo Headers204453 +Node: Commit Mode and Hooks205789 +Node: Commit Message Conventions208727 +Node: Branching210855 +Node: The Two Remotes211081 +Node: Branch Commands213734 +Node: Branch Git Variables226115 +Node: Auxiliary Branch Commands231506 +Node: Merging232624 +Node: Resolving Conflicts236632 +Node: Rebasing241633 +Node: Editing Rebase Sequences246492 +Node: Information About In-Progress Rebase250820 +Ref: Information About In-Progress Rebase-Footnote-1259702 +Node: Cherry Picking260298 +Node: Reverting264629 +Node: Resetting266078 +Node: Stashing267944 +Node: Transferring272645 +Node: Remotes272867 +Node: Remote Commands273019 +Node: Remote Git Variables277100 +Node: Fetching278379 +Node: Pulling280866 +Node: Pushing281912 +Node: Plain Patches285665 +Node: Maildir Patches287156 +Node: Miscellaneous288670 +Node: Tagging288984 +Node: Notes290901 +Node: Submodules293273 +Node: Listing Submodules293491 +Node: Submodule Transient294897 +Node: Subtree297419 +Node: Worktree299395 +Node: Common Commands301254 +Node: Wip Modes303377 +Node: Wip Graph308308 +Node: Legacy Wip Modes310622 +Node: Commands for Buffers Visiting Files313517 +Node: Minor Mode for Buffers Visiting Blobs319139 +Node: Customizing319950 +Node: Per-Repository Configuration321546 +Node: Essential Settings323801 +Node: Safety324146 +Node: Performance325907 +Node: Microsoft Windows Performance333075 +Node: MacOS Performance334266 +Ref: MacOS Performance-Footnote-1335443 +Node: Default Bindings335525 +Node: Plumbing337380 +Node: Calling Git338209 +Node: Getting a Value from Git339734 +Node: Calling Git for Effect342820 +Node: Section Plumbing349342 +Node: Creating Sections349570 +Node: Section Selection353470 +Node: Matching Sections355269 +Node: Refreshing Buffers361242 +Node: Conventions364390 +Node: Theming Faces364582 +Node: FAQ372697 +Node: FAQ - How to ...?373139 +Node: How to pronounce Magit?373552 +Node: How to show git's output?374354 +Node: How to install the gitman info manual?375140 +Node: How to show diffs for gpg-encrypted files?376110 +Node: How does branching and pushing work?376706 +Node: Can Magit be used as ediff-version-control-package?377069 +Node: Should I disable VC?379087 +Node: FAQ - Issues and Errors379705 +Node: Magit is slow380601 +Node: I changed several thousand files at once and now Magit is unusable380815 +Node: I am having problems committing381544 +Node: I am using MS Windows and cannot push with Magit382025 +Node: I am using OS X and SOMETHING works in shell but not in Magit382642 +Node: Expanding a file to show the diff causes it to disappear383473 +Node: Point is wrong in the COMMIT_EDITMSG buffer384054 +Node: The mode-line information isn't always up-to-date385100 +Node: A branch and tag sharing the same name breaks SOMETHING386163 +Node: My Git hooks work on the command-line but not inside Magit387049 +Node: git-commit-mode isn't used when committing from the command-line387895 +Node: Point ends up inside invisible text when jumping to a file-visiting buffer390166 +Node: Debugging Tools390964 +Node: Keystroke Index393143 +Node: Command Index427176 +Node: Function Index464242 +Node: Variable Index480513 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/magit-20201116.1057/magit.info-1 b/elpa/magit-20210102.1019/magit.info-1 similarity index 99% rename from elpa/magit-20201116.1057/magit.info-1 rename to elpa/magit-20210102.1019/magit.info-1 index ca38f29b..04f66c6f 100644 --- a/elpa/magit-20201116.1057/magit.info-1 +++ b/elpa/magit-20210102.1019/magit.info-1 @@ -1,6 +1,6 @@ This is magit.info, produced by makeinfo version 6.5 from magit.texi. - Copyright (C) 2015-2020 Jonas Bernoulli + Copyright (C) 2015-2021 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -31,9 +31,9 @@ to perform almost all of their daily version control tasks directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. -This manual is for Magit version 2.90.1 (v2.90.1-1092-g4b9c2d26a+1). +This manual is for Magit version 2.90.1 (v2.90.1-1133-g2fb44690b+1). - Copyright (C) 2015-2020 Jonas Bernoulli + Copyright (C) 2015-2021 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -630,7 +630,7 @@ that invokes/sets it. Do not worry about this for now. We want to create a "normal" commit, which is done by typing ‘c’ again. Now two new buffers appear. One is for writing the commit message, -the other shows a diff with the changes that you are about to committed. +the other shows a diff with the changes that you are about to commit. Write a message and then type ‘C-c C-c’ to actually create the commit. You probably don’t want to push the commit you just created because @@ -1908,6 +1908,16 @@ telling Magit to ask fewer questions. default (or selecting another). This action only concerns the deletion of multiple stashes at once. + • Publishing: + + ‘set-and-push’ When pushing to the upstream or the push-remote + and that isn’t actually configured yet, then the user can + first set the target. If s/he confirms the default too + quickly, then s/he might end up pushing to the wrong branch + and if the remote repository is configured to disallow fixing + such mistakes, then that can be quite embarrassing and + annoying. + • Edit published history: Without adding these symbols here, you will be warned before diff --git a/elpa/magit-20201116.1057/magit.info-2 b/elpa/magit-20210102.1019/magit.info-2 similarity index 99% rename from elpa/magit-20201116.1057/magit.info-2 rename to elpa/magit-20210102.1019/magit.info-2 index 5d69b5a6..bb6e5dae 100644 --- a/elpa/magit-20201116.1057/magit.info-2 +++ b/elpa/magit-20210102.1019/magit.info-2 @@ -1,6 +1,6 @@ This is magit.info, produced by makeinfo version 6.5 from magit.texi. - Copyright (C) 2015-2020 Jonas Bernoulli + Copyright (C) 2015-2021 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -41,8 +41,9 @@ beside the ones below, but these didn’t fit well anywhere else. When the region is active, this command saves that to the ‘kill-ring’, like ‘kill-ring-save’ would, instead of behaving as described above. If a prefix argument is used and the region is - within a hunk, it strips the outer diff marker column before saving - the text. + within a hunk, then it strips the diff marker column and keeps only + either the added or removed lines, depending on the sign of the + prefix argument. ‘M-w’ (‘magit-copy-buffer-revision’) @@ -833,9 +834,11 @@ more information. On Catalina, and potentially other macOS releases, there may be a performance problem where any action takes 20 times longer on Darwin -than on Linux. This can be fixed by setting ‘magit-git-executable’ to -the absolute path of the ‘git’ executable, instead of relying on -resolving the ‘$PATH’. +than on Linux. This can be worked around by setting +‘magit-git-executable’ to the absolute path of the ‘git’ executable, +instead of relying on resolving the ‘$PATH’. You should not do that if +you want to use Magit on remote machines using Tramp and if ‘git’ is not +installed in the same location on those machines. ---------- Footnotes ---------- @@ -2443,7 +2446,7 @@ Appendix C Keystroke Index * M-p <2>: Editing Rebase Sequences. (line 43) * M-w: Blaming. (line 127) -* M-w <1>: Common Commands. (line 27) +* M-w <1>: Common Commands. (line 28) * M-x magit-debug-git-executable: Git Executable. (line 45) * M-x magit-debug-git-executable <1>: Debugging Tools. (line 36) * M-x magit-describe-section-briefly: Section Types and Values. @@ -2783,7 +2786,7 @@ Appendix D Command Index * magit-commit-instant-squash: Initiating a Commit. (line 63) * magit-commit-reword: Initiating a Commit. (line 33) * magit-commit-squash: Initiating a Commit. (line 55) -* magit-copy-buffer-revision: Common Commands. (line 27) +* magit-copy-buffer-revision: Common Commands. (line 28) * magit-copy-section-value: Common Commands. (line 10) * magit-cycle-margin-style: Log Margin. (line 70) * magit-debug-git-executable: Git Executable. (line 45) diff --git a/elpa/magit-todos-20200310.28/magit-todos-pkg.el b/elpa/magit-todos-20200310.28/magit-todos-pkg.el deleted file mode 100644 index 9948bcc3..00000000 --- a/elpa/magit-todos-20200310.28/magit-todos-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "magit-todos" "20200310.28" "Show source file TODOs in Magit" '((emacs "25.2") (async "1.9.2") (dash "2.13.0") (f "0.17.2") (hl-todo "1.9.0") (magit "2.13.0") (pcre2el "1.8") (s "1.12.0")) :commit "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6" :keywords '("magit" "vc") :authors '(("Adam Porter" . "adam@alphapapa.net")) :maintainer '("Adam Porter" . "adam@alphapapa.net") :url "http://github.com/alphapapa/magit-todos") diff --git a/elpa/magit-todos-20200310.28/magit-todos-autoloads.el b/elpa/magit-todos-20201101.2240/magit-todos-autoloads.el similarity index 85% rename from elpa/magit-todos-20200310.28/magit-todos-autoloads.el rename to elpa/magit-todos-20201101.2240/magit-todos-autoloads.el index ac45b3e8..e7b1999f 100644 --- a/elpa/magit-todos-20200310.28/magit-todos-autoloads.el +++ b/elpa/magit-todos-20201101.2240/magit-todos-autoloads.el @@ -22,6 +22,11 @@ or call the function `magit-todos-mode'.") (autoload 'magit-todos-mode "magit-todos" "\ Show list of to-do items in Magit status buffer for tracked files in repo. +If called interactively, enable Magit-Todos mode if ARG is +positive, and disable it if ARG is zero or negative. If called +from Lisp, also enable the mode if ARG is omitted or nil, and +toggle it if ARG is `toggle'; disable the mode otherwise. + \(fn &optional ARG)" t nil) (autoload 'magit-todos-list "magit-todos" "\ diff --git a/elpa/magit-todos-20201101.2240/magit-todos-pkg.el b/elpa/magit-todos-20201101.2240/magit-todos-pkg.el new file mode 100644 index 00000000..97e8ee1c --- /dev/null +++ b/elpa/magit-todos-20201101.2240/magit-todos-pkg.el @@ -0,0 +1,2 @@ +;;; Generated package description from /Users/baron/.emacs.d/elpa/magit-todos-20201101.2240/magit-todos.el -*- no-byte-compile: t -*- +(define-package "magit-todos" "20201101.2240" "Show source file TODOs in Magit" '((emacs "25.2") (async "1.9.2") (dash "2.13.0") (f "0.17.2") (hl-todo "1.9.0") (magit "2.13.0") (pcre2el "1.8") (s "1.12.0")) :commit "78d24cf419138b543460f40509c8c1a168b52ca0" :authors '(("Adam Porter" . "adam@alphapapa.net")) :maintainer '("Adam Porter" . "adam@alphapapa.net") :keywords '("magit" "vc") :url "http://github.com/alphapapa/magit-todos") diff --git a/elpa/magit-todos-20200310.28/magit-todos.el b/elpa/magit-todos-20201101.2240/magit-todos.el similarity index 98% rename from elpa/magit-todos-20200310.28/magit-todos.el rename to elpa/magit-todos-20201101.2240/magit-todos.el index 96d95a2a..6686080f 100644 --- a/elpa/magit-todos-20200310.28/magit-todos.el +++ b/elpa/magit-todos-20201101.2240/magit-todos.el @@ -4,9 +4,9 @@ ;; Author: Adam Porter ;; URL: http://github.com/alphapapa/magit-todos -;; Package-Version: 20200310.28 -;; Package-Commit: a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6 -;; Version: 1.5.2 +;; Package-Version: 20201101.2240 +;; Package-Commit: 78d24cf419138b543460f40509c8c1a168b52ca0 +;; Version: 1.6-pre ;; Package-Requires: ((emacs "25.2") (async "1.9.2") (dash "2.13.0") (f "0.17.2") (hl-todo "1.9.0") (magit "2.13.0") (pcre2el "1.8") (s "1.12.0")) ;; Keywords: magit, vc @@ -361,6 +361,10 @@ from the \"topic2\" branch, this option could be set to \"topic\"." :type 'string) +(defcustom magit-todos-submodule-list nil + "Show submodule to-do list." + :type 'boolean) + ;;;; Commands ;;;###autoload @@ -782,7 +786,7 @@ sections." ;; NOTE: `magit-insert-section' seems to bind `magit-section-visibility-cache' to nil, so setting ;; visibility within calls to it probably won't work as intended. (declare (indent defun)) - (let* ((indent (s-repeat (* 2 depth) " ")) + (let* ((indent (propertize (s-repeat (* 2 depth) " ") 'face nil)) (heading (concat indent heading)) (magit-insert-section--parent (if (= 0 depth) magit-root-section @@ -844,7 +848,7 @@ sections." ;; NOTE: `magit-insert-section' seems to bind `magit-section-visibility-cache' to nil, so setting ;; visibility within calls to it probably won't work as intended. (declare (indent defun)) - (let* ((indent (s-repeat (* 2 depth) " ")) + (let* ((indent (propertize (s-repeat (* 2 depth) " ") 'face nil)) (magit-insert-section--parent (if (= 0 depth) magit-root-section magit-insert-section--parent)) @@ -1274,6 +1278,9 @@ When SYNC is non-nil, match items are returned." (when magit-todos-exclude-globs (--map (list "--glob" (concat "!" it)) magit-todos-exclude-globs)) + (unless magit-todos-submodule-list + (--map (list "--glob" (concat "!" it)) + (magit-list-module-paths))) extra-args search-regexp-pcre directory)) (magit-todos-defscanner "git grep" @@ -1289,7 +1296,10 @@ When SYNC is non-nil, match items are returned." extra-args "--" directory (when magit-todos-exclude-globs (--map (concat ":!" it) - magit-todos-exclude-globs)))) + magit-todos-exclude-globs)) + (unless magit-todos-submodule-list + (--map (list "--glob" (concat "!" it)) + (magit-list-module-paths))))) (magit-todos-defscanner "git diff" ;; NOTE: This scanner implements the regexp *searching* in elisp rather than in the @@ -1345,6 +1355,11 @@ When SYNC is non-nil, match items are returned." (list "-o" "(" (--map (list "-iname" it) magit-todos-exclude-globs) + ")" "-prune")) + (unless magit-todos-submodule-list + (list "-o" "(" + (--map (list "-iname" it) + (magit-list-module-paths)) ")" "-prune"))) (list "-o" "-type" "f") ;; NOTE: This uses "grep -P", i.e. "Interpret the pattern as a -- 2.47.3