git-multimail: update to release 1.3.1
The changes are described in CHANGES. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
May 13, 2016 at 19:00 UTC
17130a704620c0e5455ef0f362f8d0f40758d1ea
4 files changed
+20
-4
contrib/hooks/multimail/CHANGES
+8
@@ -1,3 +1,11 @@
1
+Release 1.3.1 (bugfix-only release)
2
+===================================
3
+
4
+* Generate links to commits in combined emails (it was done only for
5
+ commit emails in 1.3.0).
6
+
7
+* Fix broken links on PyPi.
8
+
9
Release 1.3.0
10
=============
11
contrib/hooks/multimail/README
+1
-1
@@ -1,4 +1,4 @@
1
-git-multimail 1.3.0
1
+git-multimail 1.3.1
2
===================
3
4
.. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
contrib/hooks/multimail/README.Git
+2
-2
@@ -6,10 +6,10 @@ website:
6
https://github.com/git-multimail/git-multimail
7
8
The version in this directory was obtained from the upstream project
9
-on May 03 2016 and consists of the "git-multimail" subdirectory from
9
+on May 13 2016 and consists of the "git-multimail" subdirectory from
10
revision
11
12
- 26f3ae9f86aa7f8a054ba89235c4d3879f98b03d refs/tags/1.3.0
12
+ 3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1
13
14
Please see the README file in this directory for information about how
15
to report bugs or contribute to git-multimail.
contrib/hooks/multimail/git_multimail.py
+9
-1
@@ -1,6 +1,6 @@
1
#! /usr/bin/env python
2
3
-__version__ = '1.3.0'
3
+__version__ = '1.3.1'
4
5
# Copyright (c) 2015 Matthieu Moy and others
6
# Copyright (c) 2012-2014 Michael Haggerty and others
@@ -1704,6 +1704,14 @@ class BranchChange(ReferenceChange):
1704
self.header_template = COMBINED_HEADER_TEMPLATE
1705
self.intro_template = COMBINED_INTRO_TEMPLATE
1706
self.footer_template = COMBINED_FOOTER_TEMPLATE
1707
+
1708
+ def revision_gen_link(base_url):
1709
+ # revision is used only to generate the body, and
1710
+ # _content_type is set while generating headers. Get it
1711
+ # from the BranchChange object.
1712
+ revision._content_type = self._content_type
1713
+ return revision.generate_browse_link(base_url)
1714
+ self.generate_browse_link = revision_gen_link
1715
for line in self.generate_email(push, body_filter, values):
1716
yield line
1717