[Midnightbsd-cvs] mports [20342] trunk/devel/mercurial: mercurial 3.5.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 28 10:31:52 EDT 2015
Revision: 20342
http://svnweb.midnightbsd.org/mports/?rev=20342
Author: laffer1
Date: 2015-09-28 10:31:50 -0400 (Mon, 28 Sep 2015)
Log Message:
-----------
mercurial 3.5.1
Modified Paths:
--------------
trunk/devel/mercurial/Makefile
trunk/devel/mercurial/distinfo
trunk/devel/mercurial/files/extra-patch-authormapsuffix
trunk/devel/mercurial/files/patch-mercurial_sslutil.py
trunk/devel/mercurial/pkg-plist
Modified: trunk/devel/mercurial/Makefile
===================================================================
--- trunk/devel/mercurial/Makefile 2015-09-28 13:44:41 UTC (rev 20341)
+++ trunk/devel/mercurial/Makefile 2015-09-28 14:31:50 UTC (rev 20342)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= mercurial
-PORTVERSION= 3.3.2
+PORTVERSION= 3.5.1
CATEGORIES= devel python
MASTER_SITES= http://mercurial.selenic.com/release/
@@ -11,9 +11,8 @@
LICENSE= gpl2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-USES= shebangfix
+USES= cpe python:2
+USE_PYTHON= distutils
OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD
OPTIONS_DEFAULT=DATA
Modified: trunk/devel/mercurial/distinfo
===================================================================
--- trunk/devel/mercurial/distinfo 2015-09-28 13:44:41 UTC (rev 20341)
+++ trunk/devel/mercurial/distinfo 2015-09-28 14:31:50 UTC (rev 20342)
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.3.2.tar.gz) = 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa
-SIZE (mercurial-3.3.2.tar.gz) = 4165131
+SHA256 (mercurial-3.5.1.tar.gz) = 997da45da303e399678c5bccd7be39b0fabf29c7e02fd3c8751c2ff88c8a259d
+SIZE (mercurial-3.5.1.tar.gz) = 4414284
Modified: trunk/devel/mercurial/files/extra-patch-authormapsuffix
===================================================================
--- trunk/devel/mercurial/files/extra-patch-authormapsuffix 2015-09-28 13:44:41 UTC (rev 20341)
+++ trunk/devel/mercurial/files/extra-patch-authormapsuffix 2015-09-28 14:31:50 UTC (rev 20342)
@@ -1,16 +1,16 @@
---- ./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
Modified: trunk/devel/mercurial/files/patch-mercurial_sslutil.py
===================================================================
--- trunk/devel/mercurial/files/patch-mercurial_sslutil.py 2015-09-28 13:44:41 UTC (rev 20341)
+++ trunk/devel/mercurial/files/patch-mercurial_sslutil.py 2015-09-28 14:31:50 UTC (rev 20342)
@@ -2,17 +2,17 @@
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
Modified: trunk/devel/mercurial/pkg-plist
===================================================================
--- trunk/devel/mercurial/pkg-plist 2015-09-28 13:44:41 UTC (rev 20341)
+++ trunk/devel/mercurial/pkg-plist 2015-09-28 14:31:50 UTC (rev 20342)
@@ -11,6 +11,9 @@
%%PYTHON_SITELIBDIR%%/hgext/bugzilla.py
%%PYTHON_SITELIBDIR%%/hgext/bugzilla.pyc
%%PYTHON_SITELIBDIR%%/hgext/bugzilla.pyo
+%%PYTHON_SITELIBDIR%%/hgext/censor.py
+%%PYTHON_SITELIBDIR%%/hgext/censor.pyc
+%%PYTHON_SITELIBDIR%%/hgext/censor.pyo
%%PYTHON_SITELIBDIR%%/hgext/children.py
%%PYTHON_SITELIBDIR%%/hgext/children.pyc
%%PYTHON_SITELIBDIR%%/hgext/children.pyo
@@ -241,6 +244,9 @@
%%PYTHON_SITELIBDIR%%/mercurial/copies.py
%%PYTHON_SITELIBDIR%%/mercurial/copies.pyc
%%PYTHON_SITELIBDIR%%/mercurial/copies.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/crecord.py
+%%PYTHON_SITELIBDIR%%/mercurial/crecord.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/crecord.pyo
%%PYTHON_SITELIBDIR%%/mercurial/dagparser.py
%%PYTHON_SITELIBDIR%%/mercurial/dagparser.pyc
%%PYTHON_SITELIBDIR%%/mercurial/dagparser.pyo
@@ -317,6 +323,7 @@
%%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
@@ -374,9 +381,6 @@
%%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
@@ -452,6 +456,9 @@
%%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
@@ -565,11 +572,14 @@
%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/shortlog.tmpl
%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/summary.tmpl
%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/tags.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/json/changelist.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/json/map
%%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.bisect
%%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.changelog
%%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
More information about the Midnightbsd-cvs
mailing list