Mercurial > hg
changeset 17572:b644287e79a8
store: unindent most of the contents of the for loop in _auxencode()
by refactoring
for i, n in enumerate(res):
if n:
<main code block>
to
for i, n in enumerate(res):
if not n:
continue
<main code block>
(no functional change)
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Sat, 15 Sep 2012 21:42:52 +0200 |
parents | 7ed972a9e7a9 |
children | fb8658ad9e8d |
files | mercurial/store.py |
diffstat | 1 files changed, 19 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/store.py Sat Sep 15 21:42:43 2012 +0200 +++ b/mercurial/store.py Sat Sep 15 21:42:52 2012 +0200 @@ -143,25 +143,26 @@ ''' res = path.split('/') for i, n in enumerate(res): - if n: - if dotencode and n[0] in '. ': - n = "~%02x" % ord(n[0]) + n[1:] + if not n: + continue + if dotencode and n[0] in '. ': + n = "~%02x" % ord(n[0]) + n[1:] + res[i] = n + else: + l = n.find('.') + if l == -1: + l = len(n) + if ((l == 3 and n[:3] in _winres3) or + (l == 4 and n[3] <= '9' and n[3] >= '1' + and n[:3] in _winres4)): + # encode third letter ('aux' -> 'au~78') + ec = "~%02x" % ord(n[2]) + n = n[0:2] + ec + n[3:] res[i] = n - else: - l = n.find('.') - if l == -1: - l = len(n) - if ((l == 3 and n[:3] in _winres3) or - (l == 4 and n[3] <= '9' and n[3] >= '1' - and n[:3] in _winres4)): - # encode third letter ('aux' -> 'au~78') - ec = "~%02x" % ord(n[2]) - n = n[0:2] + ec + n[3:] - res[i] = n - if n[-1] in '. ': - # encode last period or space ('foo...' -> 'foo..~2e') - n = n[:-1] + "~%02x" % ord(n[-1]) - res[i] = n + if n[-1] in '. ': + # encode last period or space ('foo...' -> 'foo..~2e') + n = n[:-1] + "~%02x" % ord(n[-1]) + res[i] = n return '/'.join(res) _maxstorepathlen = 120