From 16f87aa1effa5e0224f1d91db0e1364c8418f9fb Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Mon, 21 Jan 2019 15:02:46 +0100 Subject: [PATCH] Updated magit. Signed-off-by: Andreas Gerler --- elpa/magit-20190104.1519/magit.info | 187 ------------------ .../AUTHORS.md | 0 .../LICENSE | 0 .../dir | 0 .../git-rebase.el | 0 .../magit-apply.el | 0 .../magit-autoloads.el | 30 ++- .../magit-autorevert.el | 0 .../magit-bisect.el | 0 .../magit-blame.el | 0 .../magit-bookmark.el | 0 .../magit-branch.el | 0 .../magit-clone.el | 0 .../magit-commit.el | 0 .../magit-core.el | 0 .../magit-diff.el | 0 .../magit-ediff.el | 0 .../magit-extras.el | 0 .../magit-fetch.el | 0 .../magit-files.el | 0 .../magit-git.el | 0 .../magit-gitignore.el | 0 .../magit-imenu.el | 0 .../magit-log.el | 0 .../magit-margin.el | 0 .../magit-merge.el | 0 .../magit-mode.el | 1 + .../magit-notes.el | 0 .../magit-obsolete.el | 0 .../magit-patch.el | 0 .../magit-pkg.el | 2 +- .../magit-process.el | 0 .../magit-pull.el | 0 .../magit-push.el | 0 .../magit-refs.el | 0 .../magit-remote.el | 0 .../magit-repos.el | 2 +- .../magit-reset.el | 0 .../magit-section.el | 2 +- .../magit-sequence.el | 0 .../magit-stash.el | 0 .../magit-status.el | 0 .../magit-submodule.el | 2 +- .../magit-subtree.el | 0 .../magit-tag.el | 98 ++++++--- .../magit-utils.el | 2 +- .../magit-wip.el | 0 .../magit-worktree.el | 0 .../magit.el | 0 elpa/magit-20190119.1742/magit.info | 187 ++++++++++++++++++ .../magit.info-1 | 47 +++-- .../magit.info-2 | 12 +- 52 files changed, 317 insertions(+), 255 deletions(-) delete mode 100644 elpa/magit-20190104.1519/magit.info rename elpa/{magit-20190104.1519 => magit-20190119.1742}/AUTHORS.md (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/LICENSE (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/dir (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/git-rebase.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-apply.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-autoloads.el (98%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-autorevert.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-bisect.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-blame.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-bookmark.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-branch.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-clone.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-commit.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-core.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-diff.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-ediff.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-extras.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-fetch.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-files.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-git.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-gitignore.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-imenu.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-log.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-margin.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-merge.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-mode.el (99%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-notes.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-obsolete.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-patch.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-pkg.el (76%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-process.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-pull.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-push.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-refs.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-remote.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-repos.el (99%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-reset.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-section.el (99%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-sequence.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-stash.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-status.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-submodule.el (99%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-subtree.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-tag.el (54%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-utils.el (99%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-wip.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit-worktree.el (100%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit.el (100%) create mode 100644 elpa/magit-20190119.1742/magit.info rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit.info-1 (99%) rename elpa/{magit-20190104.1519 => magit-20190119.1742}/magit.info-2 (99%) diff --git a/elpa/magit-20190104.1519/magit.info b/elpa/magit-20190104.1519/magit.info deleted file mode 100644 index d3e995ff..00000000 --- a/elpa/magit-20190104.1519/magit.info +++ /dev/null @@ -1,187 +0,0 @@ -This is magit.info, produced by makeinfo version 6.5 from magit.texi. - - Copyright (C) 2015-2019 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: 304415 - -Tag Table: -(Indirect) -Node: Top754 -Node: Introduction6308 -Node: Installation11031 -Node: Installing from Melpa11361 -Node: Installing from the Git Repository12434 -Node: Post-Installation Tasks14789 -Node: Getting Started16074 -Node: Interface Concepts21421 -Node: Modes and Buffers21752 -Node: Switching Buffers23501 -Node: Naming Buffers28271 -Node: Quitting Windows31578 -Node: Automatic Refreshing of Magit Buffers33210 -Node: Automatic Saving of File-Visiting Buffers35978 -Node: Automatic Reverting of File-Visiting Buffers37163 -Node: Risk of Reverting Automatically42159 -Node: Sections44542 -Node: Section Movement45483 -Node: Section Visibility49580 -Node: Section Hooks55401 -Node: Section Types and Values57808 -Node: Section Options59111 -Node: Popup Buffers and Prefix Commands59583 -Node: Completion Confirmation and the Selection61964 -Node: Action Confirmation62401 -Node: Completion and Confirmation69747 -Node: The Selection72933 -Node: The hunk-internal region75832 -Node: Support for Completion Frameworks76921 -Node: Additional Completion Options81737 -Node: Running Git82336 -Node: Viewing Git Output82609 -Node: Git Process Status83742 -Node: Running Git Manually84707 -Node: Git Executable87109 -Node: Global Git Arguments89391 -Node: Inspecting90197 -Node: Status Buffer91344 -Node: Status Sections95334 -Node: Status Header Sections100137 -Node: Status Module Sections102767 -Node: Status Options105272 -Node: Repository List107026 -Node: Logging109184 -Node: Refreshing Logs111637 -Node: Log Buffer113022 -Node: Log Margin116817 -Node: Select from Log119457 -Node: Reflog121561 -Node: Cherries123093 -Node: Diffing124820 -Node: Refreshing Diffs127773 -Node: Diff Buffer131264 -Node: Diff Options135848 -Node: Revision Buffer140870 -Node: Ediffing143804 -Node: References Buffer147400 -Node: References Sections157164 -Node: Bisecting158025 -Node: Visiting Blobs159763 -Node: Blaming160273 -Node: Manipulating166084 -Node: Repository Setup166400 -Node: Staging and Unstaging167440 -Node: Staging from File-Visiting Buffers171521 -Node: Applying172689 -Node: Committing174582 -Node: Initiating a Commit175165 -Node: Editing Commit Messages178493 -Node: Branching188889 -Node: The Two Remotes189119 -Node: The Branch Popup191736 -Node: The Branch Config Popup203312 -Node: Auxiliary Branch Commands209253 -Node: Merging210358 -Node: Resolving Conflicts214289 -Node: Rebasing219290 -Node: Editing Rebase Sequences223454 -Node: Information About In-Progress Rebase226484 -Ref: Information About In-Progress Rebase-Footnote-1235233 -Node: Cherry Picking235829 -Node: Reverting240081 -Node: Resetting241455 -Node: Stashing243109 -Node: Transferring247632 -Node: Remotes247870 -Node: The Remote Popup248026 -Node: The Remote Config Popup251494 -Node: Fetching253150 -Node: Pulling254512 -Node: Pushing255355 -Node: Creating and Sending Patches260096 -Node: Applying Patches260933 -Node: Miscellaneous262519 -Node: Tagging262835 -Node: Notes264183 -Node: Submodules266494 -Node: Listing Submodules266708 -Node: Submodule Popup268632 -Node: Subtree271085 -Node: Worktree272325 -Node: Common Commands273288 -Node: Wip Modes275035 -Node: Wip Graph279968 -Node: Legacy Wip Modes282282 -Node: Minor Mode for Buffers Visiting Files285177 -Node: Minor Mode for Buffers Visiting Blobs290593 -Node: Customizing291406 -Node: Per-Repository Configuration293074 -Node: Essential Settings294723 -Node: Safety295047 -Node: Performance296812 -Node: Microsoft Windows Performance304415 -Node: MacOS Performance305606 -Ref: MacOS Performance-Footnote-1306842 -Ref: MacOS Performance-Footnote-2306924 -Ref: MacOS Performance-Footnote-3306984 -Node: Plumbing307150 -Node: Calling Git307973 -Node: Getting a Value from Git309498 -Node: Calling Git for Effect312584 -Node: Section Plumbing319104 -Node: Creating Sections319332 -Node: Section Selection323232 -Node: Matching Sections325031 -Node: Refreshing Buffers331004 -Node: Conventions334146 -Node: Theming Faces334338 -Node: FAQ342453 -Node: FAQ - How to ...?342895 -Node: How to show git's output?343255 -Node: How to install the gitman info manual?344009 -Node: How to show diffs for gpg-encrypted files?344979 -Node: How does branching and pushing work?345575 -Node: Can Magit be used as ediff-version-control-package?345938 -Node: FAQ - Issues and Errors347927 -Node: Magit is slow348859 -Node: I changed several thousand files at once and now Magit is unusable349073 -Node: I am having problems committing349802 -Node: I am using MS Windows and cannot push with Magit350283 -Node: I am using OS X and SOMETHING works in shell but not in Magit350900 -Node: Diffs contain control sequences351706 -Node: Expanding a file to show the diff causes it to disappear352819 -Node: Point is wrong in the COMMIT_EDITMSG buffer353370 -Node: The mode-line information isn't always up-to-date354416 -Node: A branch and tag sharing the same name breaks SOMETHING355498 -Node: My Git hooks work on the command-line but not inside Magit356386 -Node: git-commit-mode isn't used when committing from the command-line357223 -Node: Point ends up inside invisible text when jumping to a file-visiting buffer359490 -Node: Debugging Tools360288 -Node: Keystroke Index362175 -Node: Command Index393969 -Node: Function Index428623 -Node: Variable Index444004 - -End Tag Table - - -Local Variables: -coding: utf-8 -End: diff --git a/elpa/magit-20190104.1519/AUTHORS.md b/elpa/magit-20190119.1742/AUTHORS.md similarity index 100% rename from elpa/magit-20190104.1519/AUTHORS.md rename to elpa/magit-20190119.1742/AUTHORS.md diff --git a/elpa/magit-20190104.1519/LICENSE b/elpa/magit-20190119.1742/LICENSE similarity index 100% rename from elpa/magit-20190104.1519/LICENSE rename to elpa/magit-20190119.1742/LICENSE diff --git a/elpa/magit-20190104.1519/dir b/elpa/magit-20190119.1742/dir similarity index 100% rename from elpa/magit-20190104.1519/dir rename to elpa/magit-20190119.1742/dir diff --git a/elpa/magit-20190104.1519/git-rebase.el b/elpa/magit-20190119.1742/git-rebase.el similarity index 100% rename from elpa/magit-20190104.1519/git-rebase.el rename to elpa/magit-20190119.1742/git-rebase.el diff --git a/elpa/magit-20190104.1519/magit-apply.el b/elpa/magit-20190119.1742/magit-apply.el similarity index 100% rename from elpa/magit-20190104.1519/magit-apply.el rename to elpa/magit-20190119.1742/magit-apply.el diff --git a/elpa/magit-20190104.1519/magit-autoloads.el b/elpa/magit-20190119.1742/magit-autoloads.el similarity index 98% rename from elpa/magit-20190104.1519/magit-autoloads.el rename to elpa/magit-20190119.1742/magit-autoloads.el index 88fbd6a5..d63a539e 100644 --- a/elpa/magit-20190104.1519/magit-autoloads.el +++ b/elpa/magit-20190119.1742/magit-autoloads.el @@ -2561,19 +2561,29 @@ Offer to delete tags missing locally from REMOTE, and vice versa. \(fn TAGS REMOTE-TAGS REMOTE)" t nil) (autoload 'magit-tag-release "magit-tag" "\ -Create an opinionated release tag. +Create an annotated release tag. -Assume version tags that match \"\\\\`v?[0-9]\\\\(\\\\.[0-9]\\\\)*\\\\'\". -Prompt for the name of the new tag using the highest existing tag -as initial input and call \"git tag --annotate --sign -m MSG\" TAG, -regardless of whether these arguments are enabled in the popup. -Given a TAG \"v1.2.3\" and a repository \"/path/to/foo-bar\", the -MESSAGE would be \"Foo-Bar 1.2.3\". +Assume that release tags match `magit-release-tag-regexp'. -Because it is so opinionated, this command is not available from -the tag popup by default. +First prompt for the name of the new tag using the highest +existing tag as initial input and leaving it to the user to +increment the desired part of the version string. -\(fn TAG)" t nil) +Then prompt for the message of the new tag. Base the proposed +tag message on the message of the highest tag, provided that +that contains the corresponding version string and substituting +the new version string for that. Otherwise propose something +like \"Foo-Bar 1.2.3\", given, for example, a TAG \"v1.2.3\" and a +repository located at something like \"/path/to/foo-bar\". + +Then call \"git tag --annotate --sign -m MSG TAG\" to create the, +tag, regardless of whether these arguments are enabled in the +popup. Finally show the refs buffer to let the user quickly +review the result. + +\(fn TAG MSG)" t nil) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "magit-tag" '("magit-"))) ;;;*** diff --git a/elpa/magit-20190104.1519/magit-autorevert.el b/elpa/magit-20190119.1742/magit-autorevert.el similarity index 100% rename from elpa/magit-20190104.1519/magit-autorevert.el rename to elpa/magit-20190119.1742/magit-autorevert.el diff --git a/elpa/magit-20190104.1519/magit-bisect.el b/elpa/magit-20190119.1742/magit-bisect.el similarity index 100% rename from elpa/magit-20190104.1519/magit-bisect.el rename to elpa/magit-20190119.1742/magit-bisect.el diff --git a/elpa/magit-20190104.1519/magit-blame.el b/elpa/magit-20190119.1742/magit-blame.el similarity index 100% rename from elpa/magit-20190104.1519/magit-blame.el rename to elpa/magit-20190119.1742/magit-blame.el diff --git a/elpa/magit-20190104.1519/magit-bookmark.el b/elpa/magit-20190119.1742/magit-bookmark.el similarity index 100% rename from elpa/magit-20190104.1519/magit-bookmark.el rename to elpa/magit-20190119.1742/magit-bookmark.el diff --git a/elpa/magit-20190104.1519/magit-branch.el b/elpa/magit-20190119.1742/magit-branch.el similarity index 100% rename from elpa/magit-20190104.1519/magit-branch.el rename to elpa/magit-20190119.1742/magit-branch.el diff --git a/elpa/magit-20190104.1519/magit-clone.el b/elpa/magit-20190119.1742/magit-clone.el similarity index 100% rename from elpa/magit-20190104.1519/magit-clone.el rename to elpa/magit-20190119.1742/magit-clone.el diff --git a/elpa/magit-20190104.1519/magit-commit.el b/elpa/magit-20190119.1742/magit-commit.el similarity index 100% rename from elpa/magit-20190104.1519/magit-commit.el rename to elpa/magit-20190119.1742/magit-commit.el diff --git a/elpa/magit-20190104.1519/magit-core.el b/elpa/magit-20190119.1742/magit-core.el similarity index 100% rename from elpa/magit-20190104.1519/magit-core.el rename to elpa/magit-20190119.1742/magit-core.el diff --git a/elpa/magit-20190104.1519/magit-diff.el b/elpa/magit-20190119.1742/magit-diff.el similarity index 100% rename from elpa/magit-20190104.1519/magit-diff.el rename to elpa/magit-20190119.1742/magit-diff.el diff --git a/elpa/magit-20190104.1519/magit-ediff.el b/elpa/magit-20190119.1742/magit-ediff.el similarity index 100% rename from elpa/magit-20190104.1519/magit-ediff.el rename to elpa/magit-20190119.1742/magit-ediff.el diff --git a/elpa/magit-20190104.1519/magit-extras.el b/elpa/magit-20190119.1742/magit-extras.el similarity index 100% rename from elpa/magit-20190104.1519/magit-extras.el rename to elpa/magit-20190119.1742/magit-extras.el diff --git a/elpa/magit-20190104.1519/magit-fetch.el b/elpa/magit-20190119.1742/magit-fetch.el similarity index 100% rename from elpa/magit-20190104.1519/magit-fetch.el rename to elpa/magit-20190119.1742/magit-fetch.el diff --git a/elpa/magit-20190104.1519/magit-files.el b/elpa/magit-20190119.1742/magit-files.el similarity index 100% rename from elpa/magit-20190104.1519/magit-files.el rename to elpa/magit-20190119.1742/magit-files.el diff --git a/elpa/magit-20190104.1519/magit-git.el b/elpa/magit-20190119.1742/magit-git.el similarity index 100% rename from elpa/magit-20190104.1519/magit-git.el rename to elpa/magit-20190119.1742/magit-git.el diff --git a/elpa/magit-20190104.1519/magit-gitignore.el b/elpa/magit-20190119.1742/magit-gitignore.el similarity index 100% rename from elpa/magit-20190104.1519/magit-gitignore.el rename to elpa/magit-20190119.1742/magit-gitignore.el diff --git a/elpa/magit-20190104.1519/magit-imenu.el b/elpa/magit-20190119.1742/magit-imenu.el similarity index 100% rename from elpa/magit-20190104.1519/magit-imenu.el rename to elpa/magit-20190119.1742/magit-imenu.el diff --git a/elpa/magit-20190104.1519/magit-log.el b/elpa/magit-20190119.1742/magit-log.el similarity index 100% rename from elpa/magit-20190104.1519/magit-log.el rename to elpa/magit-20190119.1742/magit-log.el diff --git a/elpa/magit-20190104.1519/magit-margin.el b/elpa/magit-20190119.1742/magit-margin.el similarity index 100% rename from elpa/magit-20190104.1519/magit-margin.el rename to elpa/magit-20190119.1742/magit-margin.el diff --git a/elpa/magit-20190104.1519/magit-merge.el b/elpa/magit-20190119.1742/magit-merge.el similarity index 100% rename from elpa/magit-20190104.1519/magit-merge.el rename to elpa/magit-20190119.1742/magit-merge.el diff --git a/elpa/magit-20190104.1519/magit-mode.el b/elpa/magit-20190119.1742/magit-mode.el similarity index 99% rename from elpa/magit-20190104.1519/magit-mode.el rename to elpa/magit-20190119.1742/magit-mode.el index 3b6e06bb..2fc0ac8a 100644 --- a/elpa/magit-20190104.1519/magit-mode.el +++ b/elpa/magit-20190119.1742/magit-mode.el @@ -453,6 +453,7 @@ starts complicating other things, then it will be removed." (define-key map "!" 'magit-run-popup) (define-key map (kbd "C-c C-c") 'magit-dispatch-popup) (define-key map (kbd "C-c C-e") 'magit-edit-thing) + (define-key map (kbd "C-c C-o") 'magit-browse-thing) (define-key map (kbd "C-c C-w") 'magit-browse-thing) (define-key map (kbd "C-x a") 'magit-add-change-log-entry) (define-key map (kbd "C-x 4 a") 'magit-add-change-log-entry-other-window) diff --git a/elpa/magit-20190104.1519/magit-notes.el b/elpa/magit-20190119.1742/magit-notes.el similarity index 100% rename from elpa/magit-20190104.1519/magit-notes.el rename to elpa/magit-20190119.1742/magit-notes.el diff --git a/elpa/magit-20190104.1519/magit-obsolete.el b/elpa/magit-20190119.1742/magit-obsolete.el similarity index 100% rename from elpa/magit-20190104.1519/magit-obsolete.el rename to elpa/magit-20190119.1742/magit-obsolete.el diff --git a/elpa/magit-20190104.1519/magit-patch.el b/elpa/magit-20190119.1742/magit-patch.el similarity index 100% rename from elpa/magit-20190104.1519/magit-patch.el rename to elpa/magit-20190119.1742/magit-patch.el diff --git a/elpa/magit-20190104.1519/magit-pkg.el b/elpa/magit-20190119.1742/magit-pkg.el similarity index 76% rename from elpa/magit-20190104.1519/magit-pkg.el rename to elpa/magit-20190119.1742/magit-pkg.el index f8e58b43..3aa09e6f 100644 --- a/elpa/magit-20190104.1519/magit-pkg.el +++ b/elpa/magit-20190119.1742/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20190104.1519" "A Git porcelain inside Emacs." +(define-package "magit" "20190119.1742" "A Git porcelain inside Emacs." '((emacs "25.1") (async "20180527") (dash "20180910") diff --git a/elpa/magit-20190104.1519/magit-process.el b/elpa/magit-20190119.1742/magit-process.el similarity index 100% rename from elpa/magit-20190104.1519/magit-process.el rename to elpa/magit-20190119.1742/magit-process.el diff --git a/elpa/magit-20190104.1519/magit-pull.el b/elpa/magit-20190119.1742/magit-pull.el similarity index 100% rename from elpa/magit-20190104.1519/magit-pull.el rename to elpa/magit-20190119.1742/magit-pull.el diff --git a/elpa/magit-20190104.1519/magit-push.el b/elpa/magit-20190119.1742/magit-push.el similarity index 100% rename from elpa/magit-20190104.1519/magit-push.el rename to elpa/magit-20190119.1742/magit-push.el diff --git a/elpa/magit-20190104.1519/magit-refs.el b/elpa/magit-20190119.1742/magit-refs.el similarity index 100% rename from elpa/magit-20190104.1519/magit-refs.el rename to elpa/magit-20190119.1742/magit-refs.el diff --git a/elpa/magit-20190104.1519/magit-remote.el b/elpa/magit-20190119.1742/magit-remote.el similarity index 100% rename from elpa/magit-20190104.1519/magit-remote.el rename to elpa/magit-20190119.1742/magit-remote.el diff --git a/elpa/magit-20190104.1519/magit-repos.el b/elpa/magit-20190119.1742/magit-repos.el similarity index 99% rename from elpa/magit-20190104.1519/magit-repos.el rename to elpa/magit-20190119.1742/magit-repos.el index b45e69d3..7e7a2eee 100644 --- a/elpa/magit-20190104.1519/magit-repos.el +++ b/elpa/magit-20190119.1742/magit-repos.el @@ -141,7 +141,7 @@ repositories are displayed." (define-derived-mode magit-repolist-mode tabulated-list-mode "Repos" "Major mode for browsing a list of Git repositories." - (setq x-stretch-cursor nil) + (setq-local x-stretch-cursor nil) (setq tabulated-list-padding 0) (setq tabulated-list-sort-key (cons "Path" nil)) (setq tabulated-list-format diff --git a/elpa/magit-20190104.1519/magit-reset.el b/elpa/magit-20190119.1742/magit-reset.el similarity index 100% rename from elpa/magit-20190104.1519/magit-reset.el rename to elpa/magit-20190119.1742/magit-reset.el diff --git a/elpa/magit-20190104.1519/magit-section.el b/elpa/magit-20190119.1742/magit-section.el similarity index 99% rename from elpa/magit-20190104.1519/magit-section.el rename to elpa/magit-20190119.1742/magit-section.el index 045ce410..11c34acb 100644 --- a/elpa/magit-20190104.1519/magit-section.el +++ b/elpa/magit-20190119.1742/magit-section.el @@ -302,7 +302,7 @@ The return value has the form ((TYPE . VALUE)...)." VALUE is the value of a `magit-section' object. If that is an object itself, then that is not suitable to be used to identify the section because two objects may represent the same thing but -not be equal. If possible a method should be addef for such +not be equal. If possible a method should be added for such objects, which returns a value that is equal. Otherwise the catch-all method is used, which just returns the argument itself.") diff --git a/elpa/magit-20190104.1519/magit-sequence.el b/elpa/magit-20190119.1742/magit-sequence.el similarity index 100% rename from elpa/magit-20190104.1519/magit-sequence.el rename to elpa/magit-20190119.1742/magit-sequence.el diff --git a/elpa/magit-20190104.1519/magit-stash.el b/elpa/magit-20190119.1742/magit-stash.el similarity index 100% rename from elpa/magit-20190104.1519/magit-stash.el rename to elpa/magit-20190119.1742/magit-stash.el diff --git a/elpa/magit-20190104.1519/magit-status.el b/elpa/magit-20190119.1742/magit-status.el similarity index 100% rename from elpa/magit-20190104.1519/magit-status.el rename to elpa/magit-20190119.1742/magit-status.el diff --git a/elpa/magit-20190104.1519/magit-submodule.el b/elpa/magit-20190119.1742/magit-submodule.el similarity index 99% rename from elpa/magit-20190104.1519/magit-submodule.el rename to elpa/magit-20190119.1742/magit-submodule.el index b0e6c130..7a7f340d 100644 --- a/elpa/magit-20190104.1519/magit-submodule.el +++ b/elpa/magit-20190119.1742/magit-submodule.el @@ -569,7 +569,7 @@ These sections can be expanded to show the respective commits." (define-derived-mode magit-submodule-list-mode tabulated-list-mode "Modules" "Major mode for browsing a list of Git submodules." :group 'magit-repolist-mode - (setq x-stretch-cursor nil) + (setq-local x-stretch-cursor nil) (setq tabulated-list-padding 0) (setq tabulated-list-sort-key (cons "Path" nil)) (setq tabulated-list-format diff --git a/elpa/magit-20190104.1519/magit-subtree.el b/elpa/magit-20190119.1742/magit-subtree.el similarity index 100% rename from elpa/magit-20190104.1519/magit-subtree.el rename to elpa/magit-20190119.1742/magit-subtree.el diff --git a/elpa/magit-20190104.1519/magit-tag.el b/elpa/magit-20190119.1742/magit-tag.el similarity index 54% rename from elpa/magit-20190104.1519/magit-tag.el rename to elpa/magit-20190119.1742/magit-tag.el index afaf3caf..7187d017 100644 --- a/elpa/magit-20190104.1519/magit-tag.el +++ b/elpa/magit-20190119.1742/magit-tag.el @@ -38,6 +38,7 @@ (?s "Sign" "--sign")) :options '((?f "Sign" "--local-user=" magit-read-gpg-secret-key)) :actions '((?t "Create" magit-tag-create) + (?r "Create release" magit-tag-release) (?k "Delete" magit-tag-delete) (?p "Prune" magit-tag-prune)) :default-action 'magit-tag-create) @@ -96,38 +97,79 @@ defaulting to the tag at point. (when remote-tags (magit-run-git-async "push" remote (--map (concat ":" it) remote-tags)))) +(defvar magit-release-tag-regexp "\\`\ +\\(?1:\\(?:v\\(?:ersion\\)?\\|r\\(?:elease\\)?\\)?[-_]?\\)?\ +\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\\)\\'" + "Regexp used to parse release tag names. +The first submatch must match the prefix, if any. +The second submatch must match the version string.") + ;;;###autoload -(defun magit-tag-release (tag) - "Create an opinionated release tag. - -Assume version tags that match \"\\\\`v?[0-9]\\\\(\\\\.[0-9]\\\\)*\\\\'\". -Prompt for the name of the new tag using the highest existing tag -as initial input and call \"git tag --annotate --sign -m MSG\" TAG, -regardless of whether these arguments are enabled in the popup. -Given a TAG \"v1.2.3\" and a repository \"/path/to/foo-bar\", the -MESSAGE would be \"Foo-Bar 1.2.3\". - -Because it is so opinionated, this command is not available from -the tag popup by default." +(defun magit-tag-release (tag msg) + "Create an annotated release tag. + +Assume that release tags match `magit-release-tag-regexp'. + +First prompt for the name of the new tag using the highest +existing tag as initial input and leaving it to the user to +increment the desired part of the version string. + +Then prompt for the message of the new tag. Base the proposed +tag message on the message of the highest tag, provided that +that contains the corresponding version string and substituting +the new version string for that. Otherwise propose something +like \"Foo-Bar 1.2.3\", given, for example, a TAG \"v1.2.3\" and a +repository located at something like \"/path/to/foo-bar\". + +Then call \"git tag --annotate --sign -m MSG TAG\" to create the, +tag, regardless of whether these arguments are enabled in the +popup. Finally show the refs buffer to let the user quickly +review the result." (interactive - (list (read-string "Create tag: " - (car (nreverse - (cl-sort (magit-list-tags) #'version< - :key (lambda (tag) - (if (string-prefix-p "v" tag) - (substring tag 1) - tag)))))))) - (magit-run-git - "tag" "--annotate" "--sign" - "-m" (format "%s %s" - (capitalize (file-name-nondirectory - (directory-file-name (magit-toplevel)))) - (if (string-prefix-p "v" tag) - (substring tag 1) - tag)) - tag) + (save-match-data + (pcase-let* + ((`(,pver ,ptag ,pmsg) (car (magit--list-releases))) + (tag (read-string "Create release tag: " ptag)) + (ver (and (string-match magit-release-tag-regexp tag) + (match-string 2 tag))) + (msg (cond ((and pver (string-match (regexp-quote pver) pmsg)) + (replace-match ver t t pmsg)) + ((and ptag (string-match (regexp-quote ptag) pmsg)) + (replace-match tag t t pmsg)) + (t (format "%s %s" + (capitalize + (file-name-nondirectory + (directory-file-name (magit-toplevel)))) + ver))))) + (list tag (read-string (format "Message for %S: " tag) msg))))) + (magit-run-git "tag" "--annotate" "--sign" "-m" msg tag) (magit-show-refs)) +(defun magit--list-releases () + "Return a list of releases. +The list is ordered, beginning with the highest release. +Each release element has the form (VERSION TAG MESSAGE). +`magit-release-tag-regexp' is used to determine whether +a tag qualifies as a release tag." + (save-match-data + (mapcar + #'cdr + (nreverse + (cl-sort (cl-mapcan + (lambda (line) + (and (string-match " +" line) + (let ((tag (substring line 0 (match-beginning 0))) + (msg (substring line (match-end 0)))) + (and (string-match magit-release-tag-regexp tag) + (let ((ver (match-string 2 tag))) + (list (list (version-to-list ver) + ver tag msg))))))) + ;; Cannot rely on "--sort=-version:refname" because + ;; that gets confused if the version prefix has changed. + (magit-git-lines "tag" "-n")) + ;; The inverse of this function does not exist. + #'version-list-< :key #'car))))) + ;;; _ (provide 'magit-tag) ;;; magit-tag.el ends here diff --git a/elpa/magit-20190104.1519/magit-utils.el b/elpa/magit-20190119.1742/magit-utils.el similarity index 99% rename from elpa/magit-20190104.1519/magit-utils.el rename to elpa/magit-20190119.1742/magit-utils.el index 1ca051fb..c3a18b00 100644 --- a/elpa/magit-20190104.1519/magit-utils.el +++ b/elpa/magit-20190119.1742/magit-utils.el @@ -1093,7 +1093,7 @@ or (last of all) the value of EXP." (`woman (require 'woman) (woman (match-string 1 node))) (_ - (user-error "Invalid value for `magit-view-git-documentation'"))) + (user-error "Invalid value for `magit-view-git-manual-method'"))) (funcall fn fork))) (funcall fn fork))) diff --git a/elpa/magit-20190104.1519/magit-wip.el b/elpa/magit-20190119.1742/magit-wip.el similarity index 100% rename from elpa/magit-20190104.1519/magit-wip.el rename to elpa/magit-20190119.1742/magit-wip.el diff --git a/elpa/magit-20190104.1519/magit-worktree.el b/elpa/magit-20190119.1742/magit-worktree.el similarity index 100% rename from elpa/magit-20190104.1519/magit-worktree.el rename to elpa/magit-20190119.1742/magit-worktree.el diff --git a/elpa/magit-20190104.1519/magit.el b/elpa/magit-20190119.1742/magit.el similarity index 100% rename from elpa/magit-20190104.1519/magit.el rename to elpa/magit-20190119.1742/magit.el diff --git a/elpa/magit-20190119.1742/magit.info b/elpa/magit-20190119.1742/magit.info new file mode 100644 index 00000000..2cf5542e --- /dev/null +++ b/elpa/magit-20190119.1742/magit.info @@ -0,0 +1,187 @@ +This is magit.info, produced by makeinfo version 6.5 from magit.texi. + + Copyright (C) 2015-2019 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: 304933 + +Tag Table: +(Indirect) +Node: Top754 +Node: Introduction6307 +Node: Installation11030 +Node: Installing from Melpa11360 +Node: Installing from the Git Repository12433 +Node: Post-Installation Tasks14788 +Node: Getting Started16073 +Node: Interface Concepts21420 +Node: Modes and Buffers21751 +Node: Switching Buffers23500 +Node: Naming Buffers28270 +Node: Quitting Windows31577 +Node: Automatic Refreshing of Magit Buffers33209 +Node: Automatic Saving of File-Visiting Buffers35977 +Node: Automatic Reverting of File-Visiting Buffers37162 +Node: Risk of Reverting Automatically42158 +Node: Sections44541 +Node: Section Movement45482 +Node: Section Visibility49579 +Node: Section Hooks55400 +Node: Section Types and Values57807 +Node: Section Options59110 +Node: Popup Buffers and Prefix Commands59582 +Node: Completion Confirmation and the Selection61963 +Node: Action Confirmation62400 +Node: Completion and Confirmation69746 +Node: The Selection72932 +Node: The hunk-internal region75831 +Node: Support for Completion Frameworks76920 +Node: Additional Completion Options81736 +Node: Running Git82335 +Node: Viewing Git Output82608 +Node: Git Process Status83741 +Node: Running Git Manually84706 +Node: Git Executable87108 +Node: Global Git Arguments89390 +Node: Inspecting90196 +Node: Status Buffer91343 +Node: Status Sections95333 +Node: Status Header Sections100136 +Node: Status Module Sections102766 +Node: Status Options105271 +Node: Repository List107025 +Node: Logging109183 +Node: Refreshing Logs111636 +Node: Log Buffer113021 +Node: Log Margin116816 +Node: Select from Log119456 +Node: Reflog121560 +Node: Cherries123092 +Node: Diffing124819 +Node: Refreshing Diffs127772 +Node: Diff Buffer131263 +Node: Diff Options135847 +Node: Revision Buffer140869 +Node: Ediffing143803 +Node: References Buffer147399 +Node: References Sections157163 +Node: Bisecting158024 +Node: Visiting Blobs159762 +Node: Blaming160272 +Node: Manipulating166083 +Node: Repository Setup166399 +Node: Staging and Unstaging167439 +Node: Staging from File-Visiting Buffers171520 +Node: Applying172688 +Node: Committing174581 +Node: Initiating a Commit175164 +Node: Editing Commit Messages178492 +Node: Branching188888 +Node: The Two Remotes189118 +Node: The Branch Popup191735 +Node: The Branch Config Popup203311 +Node: Auxiliary Branch Commands209252 +Node: Merging210357 +Node: Resolving Conflicts214288 +Node: Rebasing219289 +Node: Editing Rebase Sequences223453 +Node: Information About In-Progress Rebase226483 +Ref: Information About In-Progress Rebase-Footnote-1235232 +Node: Cherry Picking235828 +Node: Reverting240080 +Node: Resetting241454 +Node: Stashing243108 +Node: Transferring247631 +Node: Remotes247869 +Node: The Remote Popup248025 +Node: The Remote Config Popup251493 +Node: Fetching253149 +Node: Pulling254511 +Node: Pushing255354 +Node: Creating and Sending Patches260095 +Node: Applying Patches260932 +Node: Miscellaneous262518 +Node: Tagging262834 +Node: Notes264701 +Node: Submodules267012 +Node: Listing Submodules267226 +Node: Submodule Popup269150 +Node: Subtree271603 +Node: Worktree272843 +Node: Common Commands273806 +Node: Wip Modes275553 +Node: Wip Graph280486 +Node: Legacy Wip Modes282800 +Node: Minor Mode for Buffers Visiting Files285695 +Node: Minor Mode for Buffers Visiting Blobs291111 +Node: Customizing291924 +Node: Per-Repository Configuration293592 +Node: Essential Settings295241 +Node: Safety295565 +Node: Performance297330 +Node: Microsoft Windows Performance304933 +Node: MacOS Performance306124 +Ref: MacOS Performance-Footnote-1307360 +Ref: MacOS Performance-Footnote-2307442 +Ref: MacOS Performance-Footnote-3307502 +Node: Plumbing307668 +Node: Calling Git308491 +Node: Getting a Value from Git310016 +Node: Calling Git for Effect313102 +Node: Section Plumbing319622 +Node: Creating Sections319850 +Node: Section Selection323750 +Node: Matching Sections325549 +Node: Refreshing Buffers331522 +Node: Conventions334664 +Node: Theming Faces334856 +Node: FAQ342971 +Node: FAQ - How to ...?343413 +Node: How to show git's output?343773 +Node: How to install the gitman info manual?344527 +Node: How to show diffs for gpg-encrypted files?345497 +Node: How does branching and pushing work?346093 +Node: Can Magit be used as ediff-version-control-package?346456 +Node: FAQ - Issues and Errors348445 +Node: Magit is slow349377 +Node: I changed several thousand files at once and now Magit is unusable349591 +Node: I am having problems committing350320 +Node: I am using MS Windows and cannot push with Magit350801 +Node: I am using OS X and SOMETHING works in shell but not in Magit351418 +Node: Diffs contain control sequences352224 +Node: Expanding a file to show the diff causes it to disappear353337 +Node: Point is wrong in the COMMIT_EDITMSG buffer353888 +Node: The mode-line information isn't always up-to-date354934 +Node: A branch and tag sharing the same name breaks SOMETHING356016 +Node: My Git hooks work on the command-line but not inside Magit356904 +Node: git-commit-mode isn't used when committing from the command-line357741 +Node: Point ends up inside invisible text when jumping to a file-visiting buffer360008 +Node: Debugging Tools360806 +Node: Keystroke Index362693 +Node: Command Index394560 +Node: Function Index429214 +Node: Variable Index444522 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/magit-20190104.1519/magit.info-1 b/elpa/magit-20190119.1742/magit.info-1 similarity index 99% rename from elpa/magit-20190104.1519/magit.info-1 rename to elpa/magit-20190119.1742/magit.info-1 index 63279e0e..32dc4b4a 100644 --- a/elpa/magit-20190104.1519/magit.info-1 +++ b/elpa/magit-20190119.1742/magit.info-1 @@ -31,7 +31,7 @@ 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-86-gcc435005b+1). +This manual is for Magit version 2.90.1 (v2.90.1-92-g21a6b757+1). Copyright (C) 2015-2019 Jonas Bernoulli @@ -6857,32 +6857,41 @@ Also see *note (gitman)git-tag::. ‘t t’ (‘magit-tag-create’) - Create a new tag with the given NAME at REV. With a prefix - argument annotate the tag. + This command creates a new tag with the given NAME at REV. With a + prefix argument it creates an annotate tag. -‘t k’ (‘magit-tag-delete’) +‘t r’ (‘magit-tag-release’) - Delete one or more tags. If the region marks multiple tags (and - nothing else), then offer to delete those. Otherwise, prompt for a - single tag to be deleted, defaulting to the tag at point. + This commands creates an annotated release tag. It assumes that + release tags match ‘magit-release-tag-regexp’. -‘t p’ (‘magit-tag-prune’) + First it prompts for the name of the new tag using the highest + existing tag as initial input and leaving it to the user to + increment the desired part of the version string. - Offer to delete tags missing locally from REMOTE, and vice versa. + Then it prompts for the message of the new tag. The proposed tag + message is based on the message of the highest tag, provided that + that contains the corresponding version string and substituting the + new version string for that. Otherwise it proposes something like + "Foo-Bar 1.2.3", given, for example, a TAG "v1.2.3" and a + repository located at something like "/path/to/foo-bar". - -- Command: magit-tag-release + Then it calls "git tag –annotate –sign -m MSG TAG" to create the + tag, regardless of whether these arguments are enabled in the + popup. Finally it shows the refs buffer to let the user quickly + review the result. - Create an opinionated release tag. +‘t k’ (‘magit-tag-delete’) - Assume version tags that match "\\‘v?[0-9]\*\\’". Prompt for the - name of the new tag using the highest existing tag as initial input - and call "git tag –annotate –sign -m MSG" TAG, regardless of - whether these arguments are enabled in the popup. Given a TAG - "v1.2.3" and a repository "/path/to/foo-bar", the MESSAGE would be - "Foo-Bar 1.2.3". + This command deletes one or more tags. If the region marks + multiple tags (and nothing else), then it offers to delete those. + Otherwise, it prompts for a single tag to be deleted, defaulting to + the tag at point. + +‘t p’ (‘magit-tag-prune’) - Because it is so opinionated, this command is not available from - the tag popup by default. + This command offers to delete tags missing locally from REMOTE, and + vice versa.  File: magit.info, Node: Notes, Next: Submodules, Prev: Tagging, Up: Miscellaneous diff --git a/elpa/magit-20190104.1519/magit.info-2 b/elpa/magit-20190119.1742/magit.info-2 similarity index 99% rename from elpa/magit-20190104.1519/magit.info-2 rename to elpa/magit-20190119.1742/magit.info-2 index 82f0173c..c14b4189 100644 --- a/elpa/magit-20190104.1519/magit.info-2 +++ b/elpa/magit-20190119.1742/magit.info-2 @@ -1696,10 +1696,11 @@ Appendix C Keystroke Index * T: Notes. (line 8) * T a: Notes. (line 51) * T c: Notes. (line 46) -* t k: Tagging. (line 18) +* t k: Tagging. (line 39) * T m: Notes. (line 37) -* t p: Tagging. (line 24) +* t p: Tagging. (line 46) * T p: Notes. (line 29) +* t r: Tagging. (line 18) * T r: Notes. (line 21) * t t: Tagging. (line 13) * T T: Notes. (line 13) @@ -2208,10 +2209,10 @@ Appendix D Command Index * magit-subtree-push: Subtree. (line 36) * magit-subtree-split: Subtree. (line 41) * magit-tag-create: Tagging. (line 13) -* magit-tag-delete: Tagging. (line 18) +* magit-tag-delete: Tagging. (line 39) * magit-tag-popup: Tagging. (line 8) -* magit-tag-prune: Tagging. (line 24) -* magit-tag-release: Tagging. (line 28) +* magit-tag-prune: Tagging. (line 46) +* magit-tag-release: Tagging. (line 18) * magit-toggle-buffer-lock: Modes and Buffers. (line 17) * magit-toggle-margin: Refreshing Logs. (line 36) * magit-toggle-margin <1>: Log Margin. (line 56) @@ -2465,7 +2466,6 @@ Appendix E Function Index * magit-status-maybe-update-blob-buffer: Section Movement. (line 83) * magit-status-maybe-update-revision-buffer: Section Movement. (line 77) -* magit-tag-release: Tagging. (line 28) * magit-wip-log: Wip Modes. (line 48) * magit-wip-log-current: Wip Modes. (line 57) * with-editor-usage-message: Editing Commit Messages. -- 2.47.3