Mercurial > hg-stable
changeset 17590:eb0884680f5c
store: eliminate one level of lambda functions on _hybridencode
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sun, 16 Sep 2012 11:36:14 +0200 |
| parents | b11024849db6 |
| children | 9a5c2ecd1158 |
| files | mercurial/store.py tests/test-hybridencode.py |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/store.py Sun Sep 16 11:36:06 2012 +0200 +++ b/mercurial/store.py Sun Sep 16 11:36:14 2012 +0200 @@ -166,7 +166,7 @@ _maxstorepathlen = 120 _dirprefixlen = 8 _maxshortdirslen = 8 * (_dirprefixlen + 1) - 4 -def _hybridencode(path, auxencode): +def _hybridencode(path, dotencode): '''encodes path with a length limit Encodes all paths that begin with 'data/', according to the following. @@ -197,11 +197,13 @@ The string 'data/' at the beginning is replaced with 'dh/', if the hashed encoding was used. ''' - res = '/'.join(auxencode(encodefilename(path).split('/'))) + ef = encodefilename(path).split('/') + res = '/'.join(_auxencode(ef, dotencode)) if len(res) > _maxstorepathlen: path = encodedir(path) digest = _sha(path).hexdigest() - parts = auxencode(lowerencode(path).split('/')[1:]) + le = lowerencode(path).split('/')[1:] + parts = _auxencode(le, dotencode) basename = parts[-1] _root, ext = os.path.splitext(basename) sdirs = [] @@ -442,8 +444,8 @@ def store(requirements, path, openertype): if 'store' in requirements: if 'fncache' in requirements: - auxencode = lambda f: _auxencode(f, 'dotencode' in requirements) - encode = lambda f: _hybridencode(f, auxencode) + de = 'dotencode' in requirements + encode = lambda f: _hybridencode(f, de) return fncachestore(path, openertype, encode) return encodedstore(path, openertype) return basicstore(path, openertype)
--- a/tests/test-hybridencode.py Sun Sep 16 11:36:06 2012 +0200 +++ b/tests/test-hybridencode.py Sun Sep 16 11:36:14 2012 +0200 @@ -1,7 +1,6 @@ from mercurial import store -auxencode = lambda f: store._auxencode(f, True) -hybridencode = lambda f: store._hybridencode(f, auxencode) +hybridencode = lambda f: store._hybridencode(f, True) enc = hybridencode # used for 'dotencode' repo format