svn commit: r548183 - in head/devel/mercurial: . files
Gleb Popov
arrowd at FreeBSD.org
Thu Sep 10 05:06:54 UTC 2020
Author: arrowd
Date: Thu Sep 10 05:06:53 2020
New Revision: 548183
URL: https://svnweb.freebsd.org/changeset/ports/548183
Log:
devel/mercurial: Fix the extra patch for FREEBSD option.
PR: 242463
Submitted by: John Hein <jcfyecrayz at liamekaens.com>
Modified:
head/devel/mercurial/Makefile
head/devel/mercurial/files/extra-patch-authormapsuffix
Modified: head/devel/mercurial/Makefile
==============================================================================
--- head/devel/mercurial/Makefile Thu Sep 10 04:04:40 2020 (r548182)
+++ head/devel/mercurial/Makefile Thu Sep 10 05:06:53 2020 (r548183)
@@ -3,6 +3,7 @@
PORTNAME= mercurial
PORTVERSION= 5.5
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= https://www.mercurial-scm.org/release/
Modified: head/devel/mercurial/files/extra-patch-authormapsuffix
==============================================================================
--- head/devel/mercurial/files/extra-patch-authormapsuffix Thu Sep 10 04:04:40 2020 (r548182)
+++ head/devel/mercurial/files/extra-patch-authormapsuffix Thu Sep 10 05:06:53 2020 (r548183)
@@ -1,6 +1,22 @@
---- hgext/convert/convcmd.py.orig 2020-06-05 21:21:27.000000000 +0200
-+++ hgext/convert/convcmd.py 2020-06-06 17:13:20.086884000 +0200
-@@ -74,7 +74,7 @@
+--- hgext/convert/__init__.py.orig 2020-08-03 17:43:51 UTC
++++ hgext/convert/__init__.py
+@@ -59,6 +59,13 @@ testedwith = b'ships-with-hg-core'
+ ),
+ (
+ 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 2020-08-03 17:43:51 UTC
++++ hgext/convert/convcmd.py
+@@ -74,7 +74,7 @@ def readauthormap(ui, authorfile, author
continue
srcauthor = srcauthor.strip()
@@ -9,7 +25,7 @@
if authors.get(srcauthor) in (None, dstauthor):
msg = _(b'mapping author %s to %s\n')
ui.debug(msg % (srcauthor, dstauthor))
-@@ -209,12 +209,16 @@
+@@ -209,12 +209,16 @@ class converter(object):
self.commitcache = {}
self.authors = {}
self.authorfile = None
@@ -26,7 +42,7 @@
# Read first the dst author map if any
authorfile = self.dest.authorfile()
if authorfile and os.path.exists(authorfile):
-@@ -482,7 +486,7 @@
+@@ -482,7 +486,7 @@ class converter(object):
def cachecommit(self, rev):
commit = self.source.getcommit(rev)
More information about the svn-ports-head
mailing list