Update to 3.5

Changelog: https://mercurial.selenic.com/wiki/WhatsNew#Mercurial_3.5_.282015-07-31.29

devel/mercurial/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 

devel/mercurial/distinfo

-SHA256 (mercurial-3.4.2.tar.gz) = dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd
-SIZE (mercurial-3.4.2.tar.gz) = 4296407
+SHA256 (mercurial-3.5.tar.gz) = b50f6978e7d39fe0cb298fa3fa3e9ce41d2356721d155e5288f9c57e5f13e9a7
+SIZE (mercurial-3.5.tar.gz) = 4403206

devel/mercurial/files/extra-patch-authormapsuffix

---- ./hgext/convert/__init__.py.orig	2014-08-01 23:22:55.000000000 +0000
-+++ ./hgext/convert/__init__.py	2014-08-17 09:14:36.000000000 +0000
-@@ -27,6 +27,7 @@
+--- hgext/convert/__init__.py.orig	2015-07-18 22:33:53 UTC
++++ hgext/convert/__init__.py
+@@ -31,6 +31,7 @@ testedwith = 'internal'
      ('d', 'dest-type', '', _('destination repository type'), _('TYPE')),
-     ('r', 'rev', '', _('import up to source revision REV'), _('REV')),
+     ('r', 'rev', [], _('import up to source revision REV'), _('REV')),
      ('A', 'authormap', '', _('remap usernames using this file'), _('FILE')),
 +    ('', 'authormapsuffix', '', _('append this suffix to remapped author names'), _('SUFFIX')),
      ('', 'filemap', '', _('remap file names using contents of file'),
       _('FILE')),
-     ('', 'splicemap', '', _('splice synthesized history into place'),
---- ./hgext/convert/convcmd.py.orig	2014-08-01 23:22:55.000000000 +0000
-+++ ./hgext/convert/convcmd.py	2014-08-02 06:58:26.000000000 +0000
-@@ -103,12 +103,15 @@
+     ('', 'full', None,
+--- hgext/convert/convcmd.py.orig	2015-07-18 22:33:53 UTC
++++ hgext/convert/convcmd.py
+@@ -136,12 +136,16 @@ class converter(object):
          self.commitcache = {}
          self.authors = {}
          self.authorfile = None
@@ -23,10 +23,11 @@
  
 +        if opts.get('authormapsuffix'):
 +            self.authormapsuffix = opts.get('authormapsuffix')
++
          # Read first the dst author map if any
          authorfile = self.dest.authorfile()
          if authorfile and os.path.exists(authorfile):
-@@ -360,7 +363,7 @@
+@@ -395,7 +399,7 @@ class converter(object):
                  continue
  
              srcauthor = srcauthor.strip()
@@ -35,12 +36,12 @@
              if self.authors.get(srcauthor) in (None, dstauthor):
                  msg = _('mapping author %s to %s\n')
                  self.ui.debug(msg % (srcauthor, dstauthor))
-@@ -374,7 +377,7 @@
+@@ -409,7 +413,7 @@ class converter(object):
  
      def cachecommit(self, rev):
          commit = self.source.getcommit(rev)
 -        commit.author = self.authors.get(commit.author, commit.author)
 +        commit.author = self.authors.get(commit.author, commit.author + self.authormapsuffix)
-         # If commit.branch is None, this commit is coming from the source
-         # repository's default branch and destined for the default branch in the
-         # destination repository. For such commits, passing a literal "None"
+         commit.branch = mapbranch(commit.branch, self.branchmap)
+         self.commitcache[rev] = commit
+         return commit

devel/mercurial/files/patch-mercurial_sslutil.py

@@ -2,17 +2,17 @@ Change condition in order to prevent SSLv2 and SSLv3 protocols.
 Taken from ${PYTHON_LIBDIR}/ssl.py file (found in 'create_default_context'
 function).
 
---- mercurial/sslutil.py.orig	2015-02-02 02:20:50 UTC
+--- mercurial/sslutil.py.orig	2015-07-18 22:33:53 UTC
 +++ mercurial/sslutil.py
-@@ -29,7 +29,10 @@ try:
-             # maintainers for us, but that breaks too many things to
-             # do it in a hurry.
-             sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
--            sslcontext.options &= ssl.OP_NO_SSLv2 & ssl.OP_NO_SSLv3
-+            # SSLv2 is considered harmful
-+            sslcontext.options |= ssl.OP_NO_SSLv2
-+            # SSLv3 has problematic security issue
-+            sslcontext.options |= ssl.OP_NO_SSLv3
-             if certfile is not None:
-                 sslcontext.load_cert_chain(certfile, keyfile)
-             sslcontext.verify_mode = cert_reqs
+@@ -28,7 +28,10 @@ try:
+         # maintainers for us, but that breaks too many things to
+         # do it in a hurry.
+         sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+-        sslcontext.options &= ssl.OP_NO_SSLv2 & ssl.OP_NO_SSLv3
++        # SSLv2 is considered harmful
++        sslcontext.options |= ssl.OP_NO_SSLv2
++        # SSLv3 has problematic security issue
++        sslcontext.options |= ssl.OP_NO_SSLv3
+         if certfile is not None:
+             def password():
+                 f = keyfile or certfile

devel/mercurial/pkg-plist

@@ -323,6 +323,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/help/phases.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revisions.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revsets.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/scripting.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/subrepos.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/templates.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/urls.txt
@@ -380,9 +381,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/i18n.py
 %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/ignore.py
-%%PYTHON_SITELIBDIR%%/mercurial/ignore.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/ignore.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
@@ -458,6 +456,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/posix.py
 %%PYTHON_SITELIBDIR%%/mercurial/posix.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/posix.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/progress.py
+%%PYTHON_SITELIBDIR%%/mercurial/progress.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/progress.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/pushkey.py
 %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyo
@@ -578,6 +579,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.compact
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.default
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.phases
+%%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.status
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.xml
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/bookmarks.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/branches.tmpl