diff options
| -rw-r--r-- | Documentation/RelNotes/2.2.0.txt | 60 | ||||
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | default.mk | 9 | ||||
| -rw-r--r-- | lisp/git-commit.el | 2 | ||||
| -rw-r--r-- | lisp/magit-popup.el | 2 | ||||
| -rw-r--r-- | lisp/magit.el | 2 | ||||
| -rw-r--r-- | lisp/with-editor.el | 2 |
7 files changed, 82 insertions, 16 deletions
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt index 1728eec..6d2b4be 100644 --- a/Documentation/RelNotes/2.2.0.txt +++ b/Documentation/RelNotes/2.2.0.txt @@ -11,14 +11,52 @@ Magit and Git itself deserve to be called porcelains. For more information about Magit, see http://magit.vc. +Please consider supporting development by making a donation. +See http://magit.vc/donations.html. + Magit v2.2.0 Release Notes ========================== -UNRELEASED. +Released 16 August 2015 by Jonas Bernoulli. + +We are pleased to announce the release of Magit version 2.2.0, +representing 321 commits by 19 people over 6 weeks. + +I would like to thank Kyle Meyer and Noam Postavsky for joining +the developer team and helping me with this release. -- Jonas Changes since v2.1.0 -------------------- +* The Elpa packages `with-editor' and `magit-popup' now depend on the + package `async' and turn on the mode `async-bytecomp-package-mode'. + If available, the mode is turned on even when these packages have + not been installed from an Elpa archive. It is being turned on in + both of these libraries because any one of them might be the first + package from the Magit repository that is being updated. + + It is possible to prevent the mode from being turned on when loading + these libraries by setting `async-bytecomp-allowed-packages' to nil + before loading them. If you do that, then you must mention that you + have done so when reporting a bug (which might therefore be due to + miscompiled files). + + Turning on `async-bytecomp-package-mode' advises `package--compile', + instructing it to compile Magit and its dependencies (as well as + others packages listed in `async-bytecomp-allowed-packages' and + their dependencies) in a separate Emacs instance. + + Unfortunately it is necessary that we do this because when an old + version of a package is already loaded when a new version is being + installed, then the old version sometimes interferes during + compilation of the new version, leading to miscompiled files. + + This usually does not happen very often, but when updating from + Magit v1 to v2 then it is expected, which is why users were + instructed to uninstall the old version before installing v2.1.0. + Unfortunately many users never saw those instructions, so we have + no choice but to use this approach to get rid of miscompiled files. + * Two new commands have been added to the diff refresh popup that allow the range of the previous diff to be manipulated. `magit-diff-flip-revs' swaps the revisions of the range, and @@ -175,3 +213,23 @@ clean-ups, bug fixes, and other small to medium improvements. Authors ------- + + 225 Jonas Bernoulli + 67 Kyle Meyer + 8 Noam Postavsky + 3 Mitchel Humpherys + 2 Greg Lucas + 2 Mark Karpov + 2 Yuichi Higashi + 1 Johann Klähn + 1 Josiah Schwab + 1 Kan-Ru Chen + 1 Nicklas Lindgren + 1 Phil Sainty + 1 Richard Kim + 1 Robin Green + 1 Rémi Vanicat + 1 Steven Vancoillie + 1 Thomas Frössman + 1 Ting-Yu Lin + 1 Vineet Naik @@ -145,8 +145,9 @@ elpa: $(ELPA_ARCHIVES) define with_editor_pkg (define-package "with-editor" "$(VERSION)" "Use the Emacsclient as $$EDITOR" - '((emacs "24.4") - (dash "2.10.0"))) + '((emacs "$(EMACS_VERSION)") + (async "$(ASYNC_VERSION)") + (dash "$(DASH_VERSION)"))) endef # ' export with_editor_pkg @@ -169,8 +170,9 @@ git-commit-$(VERSION).el: define magit_popup_pkg (define-package "magit-popup" "$(VERSION)" "Define prefix-infix-suffix command combos" - '((emacs "24.4") - (dash "2.10.0"))) + '((emacs "$(EMACS_VERSION)") + (async "$(ASYNC_VERSION)") + (dash "$(DASH_VERSION)"))) endef # ' export magit_popup_pkg @@ -191,11 +193,12 @@ ELPA_DOCS_FILES = $(addprefix Documentation/,AUTHORS.md dir magit.info) define magit_pkg (define-package "magit" "$(VERSION)" "A Git porcelain inside Emacs" - '((emacs "24.4") - (dash "2.10.0") - (with-editor "2.1.0") - (git-commit "2.1.0") - (magit-popup "2.1.0"))) + '((emacs "$(EMACS_VERSION)") + (async "$(ASYNC_VERSION)") + (dash "$(DASH_VERSION)") + (with-editor "$(VERSION)") + (git-commit "$(VERSION)") + (magit-popup "$(VERSION)"))) endef # ' export magit_pkg @@ -46,6 +46,11 @@ ELCS = $(ELS:.el=.elc) ELMS = magit.el $(filter-out $(addsuffix .el,$(PACKAGES)),$(ELS)) ELGS = magit-autoloads.el magit-version.el +# minimal requirements +EMACS_VERSION = 24.4 +ASYNC_VERSION = 1.4 +DASH_VERSION = 2.11.0 + EMACSBIN ?= emacs ELPA_DIR ?= $(HOME)/.emacs.d/elpa @@ -68,9 +73,9 @@ endif BATCH = $(EMACSBIN) -batch -Q $(LOAD_PATH) EMACSOLD := $(shell $(BATCH) --eval \ - "(and (version< emacs-version \"24.4\") (princ \"true\"))") + "(and (version< emacs-version \"$(EMACS_VERSION)\") (princ \"true\"))") ifeq "$(EMACSOLD)" "true" - $(error At least version 24.4 of Emacs is required) + $(error At least version $(EMACS_VERSION) of Emacs is required) endif VERSION := $(shell \ diff --git a/lisp/git-commit.el b/lisp/git-commit.el index 4659979..f4f21f5 100644 --- a/lisp/git-commit.el +++ b/lisp/git-commit.el @@ -11,7 +11,7 @@ ;; Marius Vollmer <marius.vollmer@gmail.com> ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li> -;; Package-Requires: ((emacs "24.4") (dash "2.11.0") (with-editor "20150808")) +;; Package-Requires: ((emacs "24.4") (dash "2.11.0") (with-editor "2.2.0")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el index f2982d9..fca53bb 100644 --- a/lisp/magit-popup.el +++ b/lisp/magit-popup.el @@ -12,7 +12,7 @@ ;; Author: Jonas Bernoulli <jonas@bernoul.li> ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li> -;; Package-Requires: ((emacs "24.4") (async "20150807") (dash "2.11.0")) +;; Package-Requires: ((emacs "24.4") (async "1.4") (dash "2.11.0")) ;; Keywords: bindings ;; Homepage: https://github.com/magit/magit diff --git a/lisp/magit.el b/lisp/magit.el index 70964b6..34440b7 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -14,7 +14,7 @@ ;; Rémi Vanicat <vanicat@debian.org> ;; Yann Hodique <yann.hodique@gmail.com> -;; Package-Requires: ((emacs "24.4") (async "20150807") (dash "2.11.0") (with-editor "20150808") (git-commit "20150808") (magit-popup "20150808")) +;; Package-Requires: ((emacs "24.4") (async "1.4") (dash "2.11.0") (with-editor "2.2.0") (git-commit "2.2.0") (magit-popup "2.2.0")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit diff --git a/lisp/with-editor.el b/lisp/with-editor.el index 5354cd3..69248b8 100644 --- a/lisp/with-editor.el +++ b/lisp/with-editor.el @@ -8,7 +8,7 @@ ;; Author: Jonas Bernoulli <jonas@bernoul.li> ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li> -;; Package-Requires: ((emacs "24.4") (async "20150807") (dash "2.11.0")) +;; Package-Requires: ((emacs "24.4") (async "1.4") (dash "2.11.0")) ;; Keywords: tools ;; Homepage: https://github.com/magit/magit |