From f44f6c14500476d918e9c01de8449edb20af4113 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 4 Oct 2021 21:55:06 +0200 Subject: [PATCH] Release version 3.3.0 --- Documentation/RelNotes/3.3.0.org | 115 ++++++++++++++++++++++++++++--- Documentation/magit-section.org | 4 +- Documentation/magit-section.texi | 4 +- Documentation/magit.org | 4 +- Documentation/magit.texi | 4 +- default.mk | 19 ++--- lisp/git-commit-pkg.el | 8 +-- lisp/git-commit.el | 4 +- lisp/magit-libgit-pkg.el | 4 +- lisp/magit-libgit.el | 4 +- lisp/magit-pkg.el | 12 ++-- lisp/magit-section-pkg.el | 4 +- lisp/magit-section.el | 4 +- lisp/magit.el | 4 +- 14 files changed, 145 insertions(+), 49 deletions(-) diff --git a/Documentation/RelNotes/3.3.0.org b/Documentation/RelNotes/3.3.0.org index 447a8bbd06..be74f192d7 100644 --- a/Documentation/RelNotes/3.3.0.org +++ b/Documentation/RelNotes/3.3.0.org @@ -1,14 +1,51 @@ -* Magit v3.3.0 Release Notes (unreleased) +* It's Magit! A Git Porcelain inside Emacs + +Magit is a text-based Git user interface that puts an unmatched focus +on streamlining workflows. Commands are invoked using short mnemonic +key sequences that take the cursor’s position in the highly actionable +interface into account to provide context-sensitive behavior. + +With Magit you can do nearly everything that you can do when using Git +on the command-line, but at greater speed and while taking advantage +of advanced features that previously seemed too daunting to use on a +daily basis. Many users will find that by using Magit they can become +more effective Git user. + +For more information about Magit, see https://magit.vc. + +* Magit v3.3.0 Release Notes + +Released 4th October 2021 by Jonas Bernoulli. + +I am pleased to announce the release of Magit version 3.3.0, +representing 88 commits by 6 contributors over two month. + +Also see https://emacsair.me/2021/10/04/magit-3.3. + ** Breaking changes + +- The last remaining alphabetic keys (both lower- and uppercase) are + now bound in ~magit-mode-map~. ~H~ to ~magit-describe-section~, ~j~ to the + new ~magit-status-quick~ (or ~magit-status-jump~ in status buffers), ~J~ + to the new ~magit-display-repository-buffer~, ~Q~ to ~magit-git-command~ + and ~Z~ to ~magit-worktree~, and once Forge is loaded, then ~N~ to + ~forge-dispatch~. (~Z~ used to be bound to ~magit-stash~, which now is + only available on ~z~.) #4259, 9bec1c54a, e401bd4d3 + +- ~I~ is now bound to ~magit-init~ instead of ~magit-gitignore~, which + continues to be available on ~i~. Users of the ~magit-imerge~ package + (which previously bound ~i~) should consult its library header for a + suggestion on how to resolve the resulting conflict. b54b537db + ** Changes since v3.2.0 -- No longer automatically add ~--full-history~ when showing log for a +- No longer automatically add ~--full-history~ when showing a log for a single file that isn't being tracked anymore. #4381 - ~magit-stash-both~ now asks before discarding merge state. #4345 -- Several infix arguments that previously could only be disabled - or have a numeric value can now also be enabled without having +- Several infix arguments, which previously could only be disabled + or have a numeric value, can now also be enabled without having an explicit numeric value. #4379 - Added ~-Xignore-space-change~ and ~-Xignore-all-space~ to ~magit-merge~. @@ -23,20 +60,45 @@ and variants for switching to any existing Magit buffer belonging to the current repository. #4259 -- A few existing commands got a new or better binding in - ~magit-dispatch~ and/or ~magit-mode-map~. - - Added new command ~magit-dired-am-apply-patches~ for use in Dired. #4094. -- Added new tranient prefix command ~magit-bundle~, which provides +- Rearranged ~magit-patch~ and added a binding for ~magit-am~. 8ec3a1a21, + 8cadf302b + +- Added new command ~magit-help~ (bound to ~h~ in ~magit-dispatch~), which + simply shows Magit's Info manual. 5bba62629 + +- When listing entries for Imenu, then remove entry counts from group + titles for the benefit of third-party packages that need stable + titles. #4477 + +- Include Forge's ~pullreq~ and ~issue~ sections when listing entries for + Imenu. f4016f734 + +- Bound ~imenu~ in the ~magit-status-jump~ prefix. 678df30c3 + +- Added new transient prefix command ~magit-bundle~, which provides support for ~git bundle~. #4392 - When minibuffer completion allows for a branch or a commit to be selected and the former is preferred and thus offered as default - if possible, then offer the commit at point as the first choice + then, if possible, offer the commit at point as the first choice initially accessible with ~next-history-element~. #4291 +- Bound ~magit-refs-set-show-commit-count~ in the ~magit-show-refs~ + prefix. 2fe42f63d + +- Added new option ~magit-commit-diff-inhibit-same-window~. #4132 + +- Added support for invoking Smerge's "keep" commands when point is on + a hunk in a Magit buffer. They can be invoked using the same key + bindings as in file-visiting buffers or ~RET~, ~u~, ~b~ and ~l~. #4458 + +- Added new command ~magit-remote-unshallow~. #4480 + +- Added new option ~git-commit-use-local-message-ring~. #4503 + ** Fixes since v3.2.0 - Make ~magit-branch-remote-head~ and ~magit-branch-current~ fall back @@ -48,10 +110,43 @@ - In some cases refreshing a buffer caused the cursor to jump to a different position. #4148 +- ~magit-convert-filename-for-git~ did not expand absolute filenames, + which is necessary because Git does not understand ~~/~. de1dc8e74 + +- ~magit-rebase~ did not enable ~--autostash~ by default but the + documentation says it does. 421be65a3 + +- ~magit-clone-read-repository~ did not convert filenames before passing + them to Git. 4aa7d2928 + - Due to a regression in v2.90.0, ~magit-wip-log~ and ~magit-wip-log-current~ failed to extract the previous tips of the wip refs from the reflog (which is relevant when - ~~magit-wip-merge-branch~ is nil). + ~~magit-wip-merge-branch~ is nil). c327824b0 - An old attempt to avoid needlessly updating section highlighting did not actually succeed. #3976 + +- An error occurred when first showing a status buffer and + ~which-function-mode~ is enabled because that caused Imenu to collect + items at a time when that is not possible yet. #4481 + +- A change in Git v2.32.0 made it necessary to explicitly filter out + directories when committing to wip worktree refs. #4499 + +- Fixed appearance of Gravatar images by forcing their size instead + relying the service to return the promised size as advertised. + 8771401d4 + +- ~git-commit-setup~ enabled the major-mode after setting local + variables, which caused non-permanent variables to be reset. + ece2cb84d + +* Authors + + 76 Jonas Bernoulli + 8 Kyle Meyer + 1 Daniel Nagy + 1 Franklin Delehelle + 1 Jonathon McKitrick + 1 Lin Sun diff --git a/Documentation/magit-section.org b/Documentation/magit-section.org index 70447e048f..33dec3fe8a 100644 --- a/Documentation/magit-section.org +++ b/Documentation/magit-section.org @@ -8,7 +8,7 @@ #+TEXINFO_DIR_CATEGORY: Emacs #+TEXINFO_DIR_TITLE: Magit-Section: (magit-section). #+TEXINFO_DIR_DESC: Use Magit sections in your own packages. -#+SUBTITLE: for version 3.2.1 (v3.2.1-33-g421be65a3+1) +#+SUBTITLE: for version 3.3.0 #+TEXINFO_DEFFN: t #+OPTIONS: H:4 num:3 toc:2 @@ -26,7 +26,7 @@ user options see [[info:magit#Sections]]. This manual documents how you can use sections in your own packages. #+TEXINFO: @noindent -This manual is for Magit-Section version 3.2.1 (v3.2.1-33-g421be65a3+1). +This manual is for Magit-Section version 3.3.0. #+BEGIN_QUOTE Copyright (C) 2015-2021 Jonas Bernoulli diff --git a/Documentation/magit-section.texi b/Documentation/magit-section.texi index cd001b4422..3d357c6dd5 100644 --- a/Documentation/magit-section.texi +++ b/Documentation/magit-section.texi @@ -31,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Magit-Section Developer Manual -@subtitle for version 3.2.1 (v3.2.1-33-g421be65a3+1) +@subtitle for version 3.3.0 @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -54,7 +54,7 @@ user options see @ref{Sections,,,magit,}. This manual documents how you can use sections in your own packages. @noindent -This manual is for Magit-Section version 3.2.1 (v3.2.1-33-g421be65a3+1). +This manual is for Magit-Section version 3.3.0. @quotation Copyright (C) 2015-2021 Jonas Bernoulli diff --git a/Documentation/magit.org b/Documentation/magit.org index 0883224419..b40ecb77a0 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -8,7 +8,7 @@ #+TEXINFO_DIR_CATEGORY: Emacs #+TEXINFO_DIR_TITLE: Magit: (magit). #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit. -#+SUBTITLE: for version 3.2.1 (v3.2.1-64-g8771401d4+1) +#+SUBTITLE: for version 3.3.0 #+TEXINFO_DEFFN: t #+OPTIONS: H:4 num:3 toc:2 @@ -25,7 +25,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. #+TEXINFO: @noindent -This manual is for Magit version 3.2.1 (v3.2.1-64-g8771401d4+1). +This manual is for Magit version 3.3.0. #+BEGIN_QUOTE Copyright (C) 2015-2021 Jonas Bernoulli diff --git a/Documentation/magit.texi b/Documentation/magit.texi index 816bc3bb64..378956c5d8 100644 --- a/Documentation/magit.texi +++ b/Documentation/magit.texi @@ -31,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Magit User Manual -@subtitle for version 3.2.1 (v3.2.1-64-g8771401d4+1) +@subtitle for version 3.3.0 @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. @noindent -This manual is for Magit version 3.2.1 (v3.2.1-64-g8771401d4+1). +This manual is for Magit version 3.3.0. @quotation Copyright (C) 2015-2021 Jonas Bernoulli diff --git a/default.mk b/default.mk index bfde98dfd0..5118c69f1f 100644 --- a/default.mk +++ b/default.mk @@ -106,24 +106,25 @@ ELGS = magit-autoloads.el magit-version.el VERSION ?= $(shell \ test -e $(TOP).git && \ git describe --tags --abbrev=0 --always | cut -c2-) +TIMESTAMP = 20211004 -DASH_VERSION = 2.18.1 +DASH_VERSION = 2.19.1 GIT_COMMIT_VERSION = $(VERSION) LIBGIT_VERSION = 0 MAGIT_VERSION = $(VERSION) MAGIT_LIBGIT_VERSION = $(VERSION) MAGIT_SECTION_VERSION = $(VERSION) TRANSIENT_VERSION = 0.3.6 -WITH_EDITOR_VERSION = 3.0.4 +WITH_EDITOR_VERSION = 3.0.5 -DASH_MELPA_SNAPSHOT = 20210330 -GIT_COMMIT_MELPA_SNAPSHOT = 20210806 +DASH_MELPA_SNAPSHOT = 20210826 +GIT_COMMIT_MELPA_SNAPSHOT = $(TIMESTAMP) LIBGIT_MELPA_SNAPSHOT = 0 -MAGIT_MELPA_SNAPSHOT = 20210806 -MAGIT_LIBGIT_MELPA_SNAPSHOT = 20210806 -MAGIT_SECTION_MELPA_SNAPSHOT = 20210806 -TRANSIENT_MELPA_SNAPSHOT = 20210701 -WITH_EDITOR_MELPA_SNAPSHOT = 20210524 +MAGIT_MELPA_SNAPSHOT = $(TIMESTAMP) +MAGIT_LIBGIT_MELPA_SNAPSHOT = $(TIMESTAMP) +MAGIT_SECTION_MELPA_SNAPSHOT = $(TIMESTAMP) +TRANSIENT_MELPA_SNAPSHOT = 20210920 +WITH_EDITOR_MELPA_SNAPSHOT = 20211001 EMACS_VERSION = 25.1 LIBGIT_EMACS_VERSION = 26.1 diff --git a/lisp/git-commit-pkg.el b/lisp/git-commit-pkg.el index 24d654d76b..890dc94655 100644 --- a/lisp/git-commit-pkg.el +++ b/lisp/git-commit-pkg.el @@ -1,8 +1,8 @@ -(define-package "git-commit" "3.2.1" +(define-package "git-commit" "3.3.0" "Edit Git commit messages." '((emacs "25.1") - (dash "20210330") - (transient "20210701") - (with-editor "20210524")) + (dash "2.19.1") + (transient "0.3.6") + (with-editor "3.0.5")) :homepage "https://magit.vc" :keywords '("git" "tools" "vc")) diff --git a/lisp/git-commit.el b/lisp/git-commit.el index 4c0716f4a2..64813af825 100644 --- a/lisp/git-commit.el +++ b/lisp/git-commit.el @@ -13,8 +13,8 @@ ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (transient "0.3.6") (with-editor "3.0.4")) -;; Package-Version: 3.2.1 +;; Package-Requires: ((emacs "25.1") (dash "2.19.1") (transient "0.3.6") (with-editor "3.0.5")) +;; Package-Version: 3.3.0 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is free software; you can redistribute it and/or modify diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el index 0ba8453d70..584d70442b 100644 --- a/lisp/magit-libgit-pkg.el +++ b/lisp/magit-libgit-pkg.el @@ -1,7 +1,7 @@ -(define-package "magit-libgit" "3.2.1" +(define-package "magit-libgit" "3.3.0" "." '((emacs "25.1") (libgit "0") - (magit "20210806")) + (magit "3.3.0")) :homepage "https://magit.vc" :keywords '("git" "tools" "vc")) diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el index bdd2025229..290d34d1e6 100644 --- a/lisp/magit-libgit.el +++ b/lisp/magit-libgit.el @@ -10,8 +10,8 @@ ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.2.1")) -;; Package-Version: 3.2.1 +;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.3.0")) +;; Package-Version: 3.3.0 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Magit is free software; you can redistribute it and/or modify it diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el index 60a08ca6b7..1dfaf4c9d1 100644 --- a/lisp/magit-pkg.el +++ b/lisp/magit-pkg.el @@ -1,10 +1,10 @@ -(define-package "magit" "3.2.1" +(define-package "magit" "3.3.0" "A Git porcelain inside Emacs." '((emacs "25.1") - (dash "20210330") - (git-commit "20210806") - (magit-section "20210806") - (transient "20210701") - (with-editor "20210524")) + (dash "2.19.1") + (git-commit "3.3.0") + (magit-section "3.3.0") + (transient "0.3.6") + (with-editor "3.0.5")) :homepage "https://magit.vc" :keywords '("git" "tools" "vc")) diff --git a/lisp/magit-section-pkg.el b/lisp/magit-section-pkg.el index 56adbd3c41..861c757ef4 100644 --- a/lisp/magit-section-pkg.el +++ b/lisp/magit-section-pkg.el @@ -1,6 +1,6 @@ -(define-package "magit-section" "3.2.1" +(define-package "magit-section" "3.3.0" "Sections for read-only buffers" '((emacs "25.1") - (dash "20210330")) + (dash "2.19.1")) :homepage "https://magit.vc" :keywords '("tools")) diff --git a/lisp/magit-section.el b/lisp/magit-section.el index b9e36c649a..a0ec82dc73 100644 --- a/lisp/magit-section.el +++ b/lisp/magit-section.el @@ -10,8 +10,8 @@ ;; Keywords: tools ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "25.1") (dash "2.18.1")) -;; Package-Version: 3.2.1 +;; Package-Requires: ((emacs "25.1") (dash "2.19.1")) +;; Package-Version: 3.3.0 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Magit-Section is free software; you can redistribute it and/or modify diff --git a/lisp/magit.el b/lisp/magit.el index 13efac0df4..d0c68c947d 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -19,8 +19,8 @@ ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (git-commit "3.2.1") (magit-section "3.2.1") (transient "0.3.6") (with-editor "3.0.4")) -;; Package-Version: 3.2.1 +;; Package-Requires: ((emacs "25.1") (dash "2.19.1") (git-commit "3.3.0") (magit-section "3.3.0") (transient "0.3.6") (with-editor "3.0.5")) +;; Package-Version: 3.3.0 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Magit is free software; you can redistribute it and/or modify it