# HG changeset patch # User Bryan O'Sullivan # Date 1348004252 25200 # Node ID d0afa149e059cea15ffe245ff5307a4a905f7e38 # Parent cbc180cfd60bc9088a10339fffb8c6a545310410 store: refactor hashed encoding into its own function diff -r cbc180cfd60b -r d0afa149e059 mercurial/store.py --- a/mercurial/store.py Tue Sep 18 19:51:59 2012 +0200 +++ b/mercurial/store.py Tue Sep 18 14:37:32 2012 -0700 @@ -184,6 +184,38 @@ _maxstorepathlen = 120 _dirprefixlen = 8 _maxshortdirslen = 8 * (_dirprefixlen + 1) - 4 + +def _hashencode(path, dotencode): + digest = _sha(path).hexdigest() + le = lowerencode(path).split('/')[1:] + parts = _auxencode(le, dotencode) + basename = parts[-1] + _root, ext = os.path.splitext(basename) + sdirs = [] + sdirslen = 0 + for p in parts[:-1]: + d = p[:_dirprefixlen] + if d[-1] in '. ': + # Windows can't access dirs ending in period or space + d = d[:-1] + '_' + if sdirslen == 0: + t = len(d) + else: + t = sdirslen + 1 + len(d) + if t > _maxshortdirslen: + break + sdirs.append(d) + sdirslen = t + dirs = '/'.join(sdirs) + if len(dirs) > 0: + dirs += '/' + res = 'dh/' + dirs + digest + ext + spaceleft = _maxstorepathlen - len(res) + if spaceleft > 0: + filler = basename[:spaceleft] + res = 'dh/' + dirs + filler + digest + ext + return res + def _hybridencode(path, dotencode): '''encodes path with a length limit @@ -219,34 +251,7 @@ ef = _encodefname(path).split('/') res = '/'.join(_auxencode(ef, dotencode)) if len(res) > _maxstorepathlen: - digest = _sha(path).hexdigest() - le = lowerencode(path).split('/')[1:] - parts = _auxencode(le, dotencode) - basename = parts[-1] - _root, ext = os.path.splitext(basename) - sdirs = [] - sdirslen = 0 - for p in parts[:-1]: - d = p[:_dirprefixlen] - if d[-1] in '. ': - # Windows can't access dirs ending in period or space - d = d[:-1] + '_' - if sdirslen == 0: - t = len(d) - else: - t = sdirslen + 1 + len(d) - if t > _maxshortdirslen: - break - sdirs.append(d) - sdirslen = t - dirs = '/'.join(sdirs) - if len(dirs) > 0: - dirs += '/' - res = 'dh/' + dirs + digest + ext - spaceleft = _maxstorepathlen - len(res) - if spaceleft > 0: - filler = basename[:spaceleft] - res = 'dh/' + dirs + filler + digest + ext + res = _hashencode(path, dotencode) return res def _calcmode(path):