Attachment 210264 Details for Bug 242463 – [patch] update mercurial to 5.2.1 including FREEBSD option (authormapsuffix)

[patch] [patch] update mercurial to 5.2.1 including FREEBSD option (authormapsuffix)

pr-mercurial-update-5.2.1.diff (text/plain), 5.32 KB, created by John Hein on 2019-12-27 20:22:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2019-12-27 20:22:56 UTC

Size: 5.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 520982)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mercurial
>-PORTVERSION=	5.1.2
>+PORTVERSION=	5.2.1
> CATEGORIES=	devel python
> MASTER_SITES=	https://www.mercurial-scm.org/release/
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 520982)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1570127396
>-SHA256 (mercurial-5.1.2.tar.gz) = 15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e
>-SIZE (mercurial-5.1.2.tar.gz) = 7286238
>+TIMESTAMP = 1575798646
>+SHA256 (mercurial-5.2.1.tar.gz) = 18b1550abf9872a6905eb67527bc73e13f2a448830cca9be883528b0ce68b3df
>+SIZE (mercurial-5.2.1.tar.gz) = 7332037
>Index: files/extra-patch-authormapsuffix
>===================================================================
>--- files/extra-patch-authormapsuffix	(revision 520982)
>+++ files/extra-patch-authormapsuffix	(working copy)
>@@ -1,13 +1,19 @@
>---- hgext/convert/__init__.py.orig	2015-07-18 22:33:53 UTC
>+--- hgext/convert/__init__.py.orig	2019-11-05 17:10:37 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')),
>-     ('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')),
>-     ('', 'full', None,
>+@@ -59,6 +59,13 @@
>+         ),
>+         (
>+             b'',
>++            b'authormapsuffix',
>++            b'',
>++            _(b'append this suffix to remapped author names'),
>++            _(b'SUFFIX'),
>++        ),
>++        (
>++            b'',
>+             b'filemap',
>+             b'',
>+             _(b'remap file names using contents of file'),
> --- hgext/convert/convcmd.py.orig	2015-07-18 22:33:53 UTC
> +++ hgext/convert/convcmd.py
> @@ -136,12 +136,16 @@ class converter(object):
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 520982)
>+++ pkg-plist	(working copy)
>@@ -342,9 +342,6 @@
> %%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.py
> %%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyc
> %%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyo
>-%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.py
>-%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.pyc
>-%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.pyo
> %%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.py
> %%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyc
> %%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyo
>@@ -684,6 +681,18 @@
> %%PYTHON_SITELIBDIR%%/mercurial/i18n.py
> %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/__init__.py
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/dirstate.py
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/dirstate.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/dirstate.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/repository.py
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/repository.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/repository.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/util.py
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/util.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/interfaces/util.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
> %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
>@@ -828,9 +837,6 @@
> %%PYTHON_SITELIBDIR%%/mercurial/repocache.py
> %%PYTHON_SITELIBDIR%%/mercurial/repocache.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/repocache.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/repository.py
>-%%PYTHON_SITELIBDIR%%/mercurial/repository.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/repository.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/repoview.py
> %%PYTHON_SITELIBDIR%%/mercurial/repoview.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/repoview.pyo
>@@ -846,6 +852,12 @@
> %%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.py
> %%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/flagutil.py
>+%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/flagutil.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/flagutil.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/sidedata.py
>+%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/sidedata.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/sidedata.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/revset.py
> %%PYTHON_SITELIBDIR%%/mercurial/revset.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/revset.pyo
>@@ -1234,9 +1246,6 @@
> %%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.py
> %%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/utils/interfaceutil.py
>-%%PYTHON_SITELIBDIR%%/mercurial/utils/interfaceutil.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/utils/interfaceutil.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.py
> %%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.pyo

Actions: View | Diff

Attachments on bug 242463: 209740 | 210264 | 210328 | 210359 | 210396 | 210397 | 210508 | 210516 | 212224 | 212948 | 213140 | 214439 | 214593 | 215296 | 215646 | 217082 | 217641 | 217677 | 217824 | 217825