Release version 3.0.0

Documentation/RelNotes/3.0.0.org

@@ -1,4 +1,27 @@
-* Magit v3.0.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.0.0 Release Notes
+
+Released 25th May 2021 by Jonas Bernoulli.
+
+I am pleased to announce the release of Magit version 3.0.0,
+representing 1264 commits by 87 contributors over 2.5 years.
+
+Also see https://emacsair.me/2021/05/25/magit-3.0.
+
 ** Breaking changes
 
 - Dropped support for Git v2.0 and v2.1.
@@ -586,3 +609,93 @@ This release also contains numerous other improvements.
 
 This release also contains numerous other bug fixes, typo fixes, and
 documentation fixes.
+
+* Authors
+
+  1001  Jonas Bernoulli
+   120  Kyle Meyer
+    10  Basil L. Contovounesios
+     9  Noam Postavsky
+     5  Vladimir Panteleev
+     4  Damien Cassou
+     4  Daniel Martín
+     4  Sam Cedarbaum
+     4  Štěpán Němec
+     3  Adam Porter
+     3  Benjamin Motz
+     3  Kévin Le Gouguec
+     2  Alban Gruin
+     2  Allen Li
+     2  Bastian Beischer
+     2  Clément Pit-Claudel
+     2  Daniel Fleischer
+     2  Evan Torrie
+     2  Ingmar Sittl
+     2  Leo Vivier
+     2  Martin Polden
+     2  Naoya Yamashita
+     2  Phil Sainty
+     2  Philipp Stephani
+     2  Radon Rosborough
+     2  Ryan C. Thompson
+     2  Szunti
+     2  Tassilo Horn
+     2  Thierry Volpiatto
+     2  Troy Hinckley
+     2  zilongshanren
+     1  Adam Kruszewski
+     1  Adam Spiers
+     1  Alexander Miller
+     1  Andrew Eggenberger
+     1  Andrew Psaltis
+     1  Andrew Schwartzmeyer
+     1  Arnau Roig Ninerola
+     1  Ashlynn Anderson
+     1  Ben North
+     1  Brian Leung
+     1  Dan Davison
+     1  Danny Zhu
+     1  David Ellison
+     1  Dominique Quatravaux
+     1  Eric
+     1  Fritz Grabo
+     1  Gregory Heytings
+     1  Hussein Ait-Lahcen
+     1  Ian Milligan
+     1  Ilya Grigoriev
+     1  Johann Klähn
+     1  Johannes Altmanninger
+     1  Jonas Galvão Xavier
+     1  Jonathan Arnett
+     1  Jonathan del Strother
+     1  Jordan Galby
+     1  Josh Elsasser
+     1  Justin Guenther
+     1  Keshav Kini
+     1  Kevin Brubeck Unhammer
+     1  Kevin J. Foley
+     1  Knut Olav Bøhmer
+     1  Magnus Malm
+     1  Mario Rodas
+     1  Martin Joerg
+     1  Matthew Kraai
+     1  Maxim Cournoyer
+     1  Michael Griffiths
+     1  Ola x Nilsson
+     1  Pancho Horrillo
+     1  Philipp Fehre
+     1  Pritam Baral
+     1  Roey Darwish Dror
+     1  Sean Whitton
+     1  Simon Pintarelli
+     1  Steve Purcell
+     1  Thomas Fini Hansen
+     1  Topi Miettinen
+     1  Tsuyoshi Kitamoto
+     1  Vitaly Ostashov
+     1  Vladimir Sedach
+     1  Wojciech Siewierski
+     1  Yann Herklotz
+     1  Ynilu
+     1  Zhu Zihao
+     1  zakora

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 2.90.1 (v2.90.1-1138-gd583ea35d+1)
+#+SUBTITLE: for version 3.0.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 2.90.1 (v2.90.1-1138-gd583ea35d+1).
+This manual is for Magit-Section version 3.0.0.
 
 #+BEGIN_QUOTE
 Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>

Documentation/magit-section.texi

@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit-Section Developer Manual
-@subtitle for version 2.90.1 (v2.90.1-1138-gd583ea35d+1)
+@subtitle for version 3.0.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 2.90.1 (v2.90.1-1138-gd583ea35d+1).
+This manual is for Magit-Section version 3.0.0.
 
 @quotation
 Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>

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 2.90.1 (v2.90.1-1221-g99291801+1)
+#+SUBTITLE: for version 3.0.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 2.90.1 (v2.90.1-1221-g99291801+1).
+This manual is for Magit version 3.0.0.
 
 #+BEGIN_QUOTE
 Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>

Documentation/magit.texi

@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.90.1 (v2.90.1-1221-g99291801+1)
+@subtitle for version 3.0.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 2.90.1 (v2.90.1-1221-g99291801+1).
+This manual is for Magit version 3.0.0.
 
 @quotation
 Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>

Makefile

@@ -220,38 +220,48 @@ define set_package_requires
 `((emacs ,emacs-version) ;`
   (dash ,dash-version)
   (transient ,transient-version)
-  (with-editor ,with-editor-version)))))
+  (with-editor ,with-editor-version))))
+  (re-search-forward "^;; Package-Version: ")
+  (delete-region (point) (line-end-position))
+  (insert git-commit-version))
+
 (with-temp-file "lisp/magit-libgit.el"
   (insert-file-contents "lisp/magit-libgit.el")
   (re-search-forward "^;; Package-Requires: ")
   (delete-region (point) (line-end-position))
   (insert (format "%S"
 `((emacs "$(LIBGIT_EMACS_VERSION)") ;`
   (magit "$(LIBGIT_MAGIT_VERSION)")
-  (libgit ,libgit-version)))))
+  (libgit ,libgit-version))))
+  (re-search-forward "^;; Package-Version: ")
+  (delete-region (point) (line-end-position))
+  (insert magit-libgit-version))
 (with-temp-file "lisp/magit-section.el"
   (insert-file-contents "lisp/magit-section.el")
   (re-search-forward "^;; Package-Requires: ")
   (delete-region (point) (line-end-position))
   (insert (format "%S"
 `((emacs ,emacs-version) ;`
-  (dash ,dash-version)))))
+  (dash ,dash-version))))
+  (re-search-forward "^;; Package-Version: ")
+  (delete-region (point) (line-end-position))
+  (insert magit-section-version))
 (with-temp-file "lisp/magit-pkg.el"
   (insert (format
 "(define-package \"magit\" \"$(VERSION)\"\
   \"A Git porcelain inside Emacs.\"
   '((emacs %S)
     (dash %S)
     (git-commit %S)
-    ;; FIXME (magit-section %S)
+    (magit-section %S)
     (transient %S)
     (with-editor %S))
   :homepage \"https://magit.vc\"
   :keywords '(\"git\" \"tools\" \"vc\"))
 "   emacs-version
     dash-version
     git-commit-version
-    ;; magit-section-version
+    magit-section-version
     transient-version
     with-editor-version))
   (goto-char (point-min))
@@ -268,6 +278,7 @@ bump-versions-1:
         (dash-version \"$(DASH_VERSION)\")\
         (git-commit-version \"$(GIT_COMMIT_VERSION)\")\
         (libgit-version \"$(LIBGIT_VERSION)\")\
+        (magit-libgit-version \"$(MAGIT_LIBGIT_VERSION)\")\
         (magit-section-version \"$(MAGIT_SECTION_VERSION)\")\
         (transient-version \"$(TRANSIENT_VERSION)\")\
         (with-editor-version \"$(WITH_EDITOR_VERSION)\"))\
@@ -279,6 +290,7 @@ bump-snapshots:
         (dash-version \"$(DASH_MELPA_SNAPSHOT)\")\
         (git-commit-version \"$(GIT_COMMIT_MELPA_SNAPSHOT)\")\
         (libgit-version \"$(LIBGIT_MELPA_SNAPSHOT)\")\
+        (magit-libgit-version \"$(MAGIT_LIBGIT_MELPA_SNAPSHOT)\")\
         (magit-section-version \"$(MAGIT_SECTION_MELPA_SNAPSHOT)\")\
         (transient-version \"$(TRANSIENT_MELPA_SNAPSHOT)\")\
         (with-editor-version \"$(WITH_EDITOR_MELPA_SNAPSHOT)\"))\

default.mk

@@ -106,24 +106,26 @@ VERSION ?= $(shell \
   test -e $(TOP).git && \
   git describe --tags --abbrev=0 --always | cut -c2-)
 
-DASH_VERSION        = 2.17.0
-GIT_COMMIT_VERSION  = 3.0.0
-LIBGIT_VERSION      = 0
-MAGIT_SECTION_VERSION = 3.0.0
-TRANSIENT_VERSION   = 0
-WITH_EDITOR_VERSION = 2.9.2
-
-DASH_MELPA_SNAPSHOT        = 20200524
-GIT_COMMIT_MELPA_SNAPSHOT  = 20200516
-LIBGIT_MELPA_SNAPSHOT      = 0
-MAGIT_SECTION_MELPA_SNAPSHOT = 20200605
-TRANSIENT_MELPA_SNAPSHOT   = 20200601
-WITH_EDITOR_MELPA_SNAPSHOT = 20200522
+DASH_VERSION          = 2.18.1
+GIT_COMMIT_VERSION    = $(VERSION)
+LIBGIT_VERSION        = 0
+MAGIT_LIBGIT_VERSION  = 0
+MAGIT_SECTION_VERSION = $(VERSION)
+TRANSIENT_VERSION     = 0.3.3
+WITH_EDITOR_VERSION   = 3.0.4
+
+DASH_MELPA_SNAPSHOT          = 20210330
+GIT_COMMIT_MELPA_SNAPSHOT    = 20210524
+LIBGIT_MELPA_SNAPSHOT        = 0
+MAGIT_LIBGIT_MELPA_SNAPSHOT  = 0
+MAGIT_SECTION_MELPA_SNAPSHOT = 20210524
+TRANSIENT_MELPA_SNAPSHOT     = 20210524
+WITH_EDITOR_MELPA_SNAPSHOT   = 20210524
 
 EMACS_VERSION = 25.1
 
 LIBGIT_EMACS_VERSION = 26.1
-LIBGIT_MAGIT_VERSION = 0
+LIBGIT_MAGIT_VERSION = $(VERSION)
 
 EMACSOLD := $(shell $(BATCH) --eval \
   "(and (version< emacs-version \"$(EMACS_VERSION)\") (princ \"true\"))")

lisp/git-commit.el

@@ -13,7 +13,8 @@
 
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (dash "20200524") (transient "20200601") (with-editor "20200522"))
+;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (transient "0.3.3") (with-editor "3.0.4"))
+;; Package-Version: 3.0.0
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; This file is free software; you can redistribute it and/or modify

lisp/magit-libgit.el

@@ -10,7 +10,8 @@
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
-;; Package-Requires: ((emacs "26.1") (magit "0") (libgit "0"))
+;; Package-Requires: ((emacs "26.1") (magit "3.0.0") (libgit "0"))
+;; Package-Version: 0
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; Magit is free software; you can redistribute it and/or modify it

lisp/magit-pkg.el

@@ -1,9 +1,10 @@
-(define-package "magit" "2.90.1"
+(define-package "magit" "3.0.0"
   "A Git porcelain inside Emacs."
   '((emacs "25.1")
-    (dash "20200524")
-    (git-commit "20200516")
-    (transient "20200601")
-    (with-editor "20200522"))
+    (dash "2.18.1")
+    (git-commit "3.0.0")
+    (magit-section "3.0.0")
+    (transient "0.3.3")
+    (with-editor "3.0.4"))
   :homepage "https://magit.vc"
   :keywords '("git" "tools" "vc"))

lisp/magit-section.el

@@ -10,7 +10,8 @@
 
 ;; Keywords: tools
 ;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (dash "20200524"))
+;; Package-Requires: ((emacs "25.1") (dash "2.18.1"))
+;; Package-Version: 3.0.0
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
 ;; Magit-Section is free software; you can redistribute it and/or modify