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>

diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
index 53c71b422a7ac26511b76bc3854e1f04918096f6..100cc7a6d35c66e388d09dbd8d566b860a9b7c0d 100644 (file)
--- a/contrib/hooks/multimail/CHANGES
+++ b/contrib/hooks/multimail/CHANGES
@@ -1,3 +1,11 @@
+Release 1.3.1 (bugfix-only release)
+===================================
+
+* Generate links to commits in combined emails (it was done only for
+  commit emails in 1.3.0).
+
+* Fix broken links on PyPi.
+

 Release 1.3.0
 =============
 
 Release 1.3.0
 =============
 

diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 1e0480197843ee7e3a5a9152f98dcae8f3f56f14..0c91d19a57093a8676b126a3cc531840e6898d89 100644 (file)
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -1,4 +1,4 @@
-git-multimail 1.3.0
+git-multimail 1.3.1

 ===================
 
 .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
 ===================
 
 .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master

diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index ee1fa75f99f193bbb8f05b343b99f2c776aa1084..1210bde045c8ce850e49bf619a0c5fe35409030f 100644 (file)
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -6,10 +6,10 @@ website:
     https://github.com/git-multimail/git-multimail
 
 The version in this directory was obtained from the upstream project
     https://github.com/git-multimail/git-multimail
 
 The version in this directory was obtained from the upstream project

-on May 03 2016 and consists of the "git-multimail" subdirectory from
+on May 13 2016 and consists of the "git-multimail" subdirectory from

 revision
 
 revision
 

-    26f3ae9f86aa7f8a054ba89235c4d3879f98b03d refs/tags/1.3.0
+    3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1

 
 Please see the README file in this directory for information about how
 to report bugs or contribute to git-multimail.
 
 Please see the README file in this directory for information about how
 to report bugs or contribute to git-multimail.

diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index f2c92aeed8e45545887197e7e4dfbda1b366153c..54ab4a49429fd9a3a31cdc471befe4852db369a6 100755 (executable)
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
 #! /usr/bin/env python
 

-__version__ = '1.3.0'
+__version__ = '1.3.1'

 
 # Copyright (c) 2015 Matthieu Moy and others
 # Copyright (c) 2012-2014 Michael Haggerty and others
 
 # Copyright (c) 2015 Matthieu Moy and others
 # Copyright (c) 2012-2014 Michael Haggerty and others


@@ -1704,6 +1704,14 @@ def generate_combined_email(self, push, revision, body_filter=None, extra_header
         self.header_template = COMBINED_HEADER_TEMPLATE
         self.intro_template = COMBINED_INTRO_TEMPLATE
         self.footer_template = COMBINED_FOOTER_TEMPLATE
         self.header_template = COMBINED_HEADER_TEMPLATE
         self.intro_template = COMBINED_INTRO_TEMPLATE
         self.footer_template = COMBINED_FOOTER_TEMPLATE

+
+        def revision_gen_link(base_url):
+            # revision is used only to generate the body, and
+            # _content_type is set while generating headers. Get it
+            # from the BranchChange object.
+            revision._content_type = self._content_type
+            return revision.generate_browse_link(base_url)
+        self.generate_browse_link = revision_gen_link

         for line in self.generate_email(push, body_filter, values):
             yield line
 
         for line in self.generate_email(push, body_filter, values):
             yield line