[PATCH 1 of 7] pycompat: move rapply() from util
Yuya Nishihara
yuya at tcha.org
Thu Jul 5 14:14:26 UTC 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1528618049 -32400
# Sun Jun 10 17:07:29 2018 +0900
# Node ID b67512d491f655c9602004420f8a5922341ba5cc
# Parent 600d8d9b8551088ee78e8005646d2dedd7a8d0c2
pycompat: move rapply() from util
I want to use rapply() in utils.* modules, but that would introduce a
reference cycle util -> utils.* -> util. Moving rapply() to pycompat
should be okay since it mostly serves as a compatibility helper.
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1680,7 +1680,7 @@ def showmarker(fm, marker, index=None):
fm.write('date', '(%s) ', fm.formatdate(marker.date()))
meta = marker.metadata().copy()
meta.pop('date', None)
- smeta = util.rapply(pycompat.maybebytestr, meta)
+ smeta = pycompat.rapply(pycompat.maybebytestr, meta)
fm.write('metadata', '{%s}', fm.formatdict(smeta, fmt='%r: %r', sep=', '))
fm.plain('\n')
diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py
--- a/mercurial/pycompat.py
+++ b/mercurial/pycompat.py
@@ -47,6 +47,39 @@ else:
def identity(a):
return a
+def _rapply(f, xs):
+ if xs is None:
+ # assume None means non-value of optional data
+ return xs
+ if isinstance(xs, (list, set, tuple)):
+ return type(xs)(_rapply(f, x) for x in xs)
+ if isinstance(xs, dict):
+ return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
+ return f(xs)
+
+def rapply(f, xs):
+ """Apply function recursively to every item preserving the data structure
+
+ >>> def f(x):
+ ... return 'f(%s)' % x
+ >>> rapply(f, None) is None
+ True
+ >>> rapply(f, 'a')
+ 'f(a)'
+ >>> rapply(f, {'a'}) == {'f(a)'}
+ True
+ >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
+ ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
+
+ >>> xs = [object()]
+ >>> rapply(identity, xs) is xs
+ True
+ """
+ if f is identity:
+ # fast path mainly for py2
+ return xs
+ return _rapply(f, xs)
+
if ispy3:
import builtins
import functools
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -111,7 +111,7 @@ def _getrevsource(repo, r):
return None
def _sortedb(xs):
- return sorted(util.rapply(pycompat.maybebytestr, xs))
+ return sorted(pycompat.rapply(pycompat.maybebytestr, xs))
# operator methods
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -865,7 +865,7 @@ def cleanupnodes(repo, replacements, ope
continue
from . import bookmarks # avoid import cycle
repo.ui.debug('moving bookmarks %r from %s to %s\n' %
- (util.rapply(pycompat.maybebytestr, oldbmarks),
+ (pycompat.rapply(pycompat.maybebytestr, oldbmarks),
hex(oldnode), hex(newnode)))
# Delete divergent bookmarks being parents of related newnodes
deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
diff --git a/mercurial/smartset.py b/mercurial/smartset.py
--- a/mercurial/smartset.py
+++ b/mercurial/smartset.py
@@ -29,7 +29,7 @@ def _formatsetrepr(r):
if r is None:
return ''
elif isinstance(r, tuple):
- return r[0] % util.rapply(pycompat.maybebytestr, r[1:])
+ return r[0] % pycompat.rapply(pycompat.maybebytestr, r[1:])
elif isinstance(r, bytes):
return r
elif callable(r):
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -156,10 +156,10 @@ b"""# example system-wide hg config (see
}
def _maybestrurl(maybebytes):
- return util.rapply(pycompat.strurl, maybebytes)
+ return pycompat.rapply(pycompat.strurl, maybebytes)
def _maybebytesurl(maybestr):
- return util.rapply(pycompat.bytesurl, maybestr)
+ return pycompat.rapply(pycompat.bytesurl, maybestr)
class httppasswordmgrdbproxy(object):
"""Delays loading urllib2 until it's needed."""
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -131,39 +131,6 @@ except AttributeError:
_notset = object()
-def _rapply(f, xs):
- if xs is None:
- # assume None means non-value of optional data
- return xs
- if isinstance(xs, (list, set, tuple)):
- return type(xs)(_rapply(f, x) for x in xs)
- if isinstance(xs, dict):
- return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
- return f(xs)
-
-def rapply(f, xs):
- """Apply function recursively to every item preserving the data structure
-
- >>> def f(x):
- ... return 'f(%s)' % x
- >>> rapply(f, None) is None
- True
- >>> rapply(f, 'a')
- 'f(a)'
- >>> rapply(f, {'a'}) == {'f(a)'}
- True
- >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
- ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
-
- >>> xs = [object()]
- >>> rapply(pycompat.identity, xs) is xs
- True
- """
- if f is pycompat.identity:
- # fast path mainly for py2
- return xs
- return _rapply(f, xs)
-
def bitsfrom(container):
bits = 0
for bit in container:
More information about the Mercurial-devel
mailing list