View | Details | Raw Unified | Return to bug 242463 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mercurial
4
PORTNAME=	mercurial
5
PORTVERSION=	5.1.2
5
PORTVERSION=	5.2.1
6
CATEGORIES=	devel python
6
CATEGORIES=	devel python
7
MASTER_SITES=	https://www.mercurial-scm.org/release/
7
MASTER_SITES=	https://www.mercurial-scm.org/release/
8
8
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1570127396
1
TIMESTAMP = 1575798646
2
SHA256 (mercurial-5.1.2.tar.gz) = 15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e
2
SHA256 (mercurial-5.2.1.tar.gz) = 18b1550abf9872a6905eb67527bc73e13f2a448830cca9be883528b0ce68b3df
3
SIZE (mercurial-5.1.2.tar.gz) = 7286238
3
SIZE (mercurial-5.2.1.tar.gz) = 7332037
(-)files/extra-patch-authormapsuffix (-9 / +15 lines)
Lines 1-13 Link Here
1
--- hgext/convert/__init__.py.orig	2015-07-18 22:33:53 UTC
1
--- hgext/convert/__init__.py.orig	2019-11-05 17:10:37 UTC
2
+++ hgext/convert/__init__.py
2
+++ hgext/convert/__init__.py
3
@@ -31,6 +31,7 @@ testedwith = 'internal'
3
@@ -59,6 +59,13 @@
4
     ('d', 'dest-type', '', _('destination repository type'), _('TYPE')),
4
         ),
5
     ('r', 'rev', [], _('import up to source revision REV'), _('REV')),
5
         (
6
     ('A', 'authormap', '', _('remap usernames using this file'), _('FILE')),
6
             b'',
7
+    ('', 'authormapsuffix', '', _('append this suffix to remapped author names'), _('SUFFIX')),
7
+            b'authormapsuffix',
8
     ('', 'filemap', '', _('remap file names using contents of file'),
8
+            b'',
9
      _('FILE')),
9
+            _(b'append this suffix to remapped author names'),
10
     ('', 'full', None,
10
+            _(b'SUFFIX'),
11
+        ),
12
+        (
13
+            b'',
14
             b'filemap',
15
             b'',
16
             _(b'remap file names using contents of file'),
11
--- hgext/convert/convcmd.py.orig	2015-07-18 22:33:53 UTC
17
--- hgext/convert/convcmd.py.orig	2015-07-18 22:33:53 UTC
12
+++ hgext/convert/convcmd.py
18
+++ hgext/convert/convcmd.py
13
@@ -136,12 +136,16 @@ class converter(object):
19
@@ -136,12 +136,16 @@ class converter(object):
(-)pkg-plist (-9 / +18 lines)
Lines 342-350 Link Here
342
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.py
342
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.py
343
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyc
343
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyc
344
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyo
344
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyo
345
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.py
346
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.pyc
347
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.pyo
348
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.py
345
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.py
349
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyc
346
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyc
350
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyo
347
%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyo
Lines 684-689 Link Here
684
%%PYTHON_SITELIBDIR%%/mercurial/i18n.py
681
%%PYTHON_SITELIBDIR%%/mercurial/i18n.py
685
%%PYTHON_SITELIBDIR%%/mercurial/i18n.pyc
682
%%PYTHON_SITELIBDIR%%/mercurial/i18n.pyc
686
%%PYTHON_SITELIBDIR%%/mercurial/i18n.pyo
683
%%PYTHON_SITELIBDIR%%/mercurial/i18n.pyo
684
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/__init__.py
685
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/__init__.pyc
686
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/__init__.pyo
687
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/dirstate.py
688
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/dirstate.pyc
689
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/dirstate.pyo
690
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/repository.py
691
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/repository.pyc
692
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/repository.pyo
693
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/util.py
694
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/util.pyc
695
%%PYTHON_SITELIBDIR%%/mercurial/interfaces/util.pyo
687
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
696
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
688
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
697
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
689
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
698
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
Lines 828-836 Link Here
828
%%PYTHON_SITELIBDIR%%/mercurial/repocache.py
837
%%PYTHON_SITELIBDIR%%/mercurial/repocache.py
829
%%PYTHON_SITELIBDIR%%/mercurial/repocache.pyc
838
%%PYTHON_SITELIBDIR%%/mercurial/repocache.pyc
830
%%PYTHON_SITELIBDIR%%/mercurial/repocache.pyo
839
%%PYTHON_SITELIBDIR%%/mercurial/repocache.pyo
831
%%PYTHON_SITELIBDIR%%/mercurial/repository.py
832
%%PYTHON_SITELIBDIR%%/mercurial/repository.pyc
833
%%PYTHON_SITELIBDIR%%/mercurial/repository.pyo
834
%%PYTHON_SITELIBDIR%%/mercurial/repoview.py
840
%%PYTHON_SITELIBDIR%%/mercurial/repoview.py
835
%%PYTHON_SITELIBDIR%%/mercurial/repoview.pyc
841
%%PYTHON_SITELIBDIR%%/mercurial/repoview.pyc
836
%%PYTHON_SITELIBDIR%%/mercurial/repoview.pyo
842
%%PYTHON_SITELIBDIR%%/mercurial/repoview.pyo
Lines 846-851 Link Here
846
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.py
852
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.py
847
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.pyc
853
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.pyc
848
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.pyo
854
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/deltas.pyo
855
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/flagutil.py
856
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/flagutil.pyc
857
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/flagutil.pyo
858
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/sidedata.py
859
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/sidedata.pyc
860
%%PYTHON_SITELIBDIR%%/mercurial/revlogutils/sidedata.pyo
849
%%PYTHON_SITELIBDIR%%/mercurial/revset.py
861
%%PYTHON_SITELIBDIR%%/mercurial/revset.py
850
%%PYTHON_SITELIBDIR%%/mercurial/revset.pyc
862
%%PYTHON_SITELIBDIR%%/mercurial/revset.pyc
851
%%PYTHON_SITELIBDIR%%/mercurial/revset.pyo
863
%%PYTHON_SITELIBDIR%%/mercurial/revset.pyo
Lines 1234-1242 Link Here
1234
%%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.py
1246
%%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.py
1235
%%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.pyc
1247
%%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.pyc
1236
%%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.pyo
1248
%%PYTHON_SITELIBDIR%%/mercurial/utils/dateutil.pyo
1237
%%PYTHON_SITELIBDIR%%/mercurial/utils/interfaceutil.py
1238
%%PYTHON_SITELIBDIR%%/mercurial/utils/interfaceutil.pyc
1239
%%PYTHON_SITELIBDIR%%/mercurial/utils/interfaceutil.pyo
1240
%%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.py
1249
%%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.py
1241
%%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.pyc
1250
%%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.pyc
1242
%%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.pyo
1251
%%PYTHON_SITELIBDIR%%/mercurial/utils/procutil.pyo

Return to bug 242463