Mercurial > hg
comparison mercurial/hg.py @ 24306:6ddc86eedc3b
style: kill ersatz if-else ternary operators
Although Python supports `X = Y if COND else Z`, this was only
introduced in Python 2.5. Since we have to support Python 2.4, it was
a very common thing to write instead `X = COND and Y or Z`, which is a
bit obscure at a glance. It requires some intricate knowledge of
Python to understand how to parse these one-liners.
We change instead all of these one-liners to 4-liners. This was
executed with the following perlism:
find -name "*.py" -exec perl -pi -e 's,(\s*)([\.\w]+) = \(?(\S+)\s+and\s+(\S*)\)?\s+or\s+(\S*)$,$1if $3:\n$1 $2 = $4\n$1else:\n$1 $2 = $5,' {} \;
I tweaked the following cases from the automatic Perl output:
prev = (parents and parents[0]) or nullid
port = (use_ssl and 443 or 80)
cwd = (pats and repo.getcwd()) or ''
rename = fctx and webutil.renamelink(fctx) or []
ctx = fctx and fctx or ctx
self.base = (mapfile and os.path.dirname(mapfile)) or ''
I also added some newlines wherever they seemd appropriate for readability
There are probably a few ersatz ternary operators still in the code
somewhere, lurking away from the power of a simple regex.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Fri, 13 Mar 2015 17:00:06 -0400 |
parents | b76d8c641746 |
children | 27ad6b91f5c2 |
comparison
equal
deleted
inserted
replaced
24305:867c3649be5d | 24306:6ddc86eedc3b |
---|---|
32 elif revs: | 32 elif revs: |
33 y = revs[0] | 33 y = revs[0] |
34 else: | 34 else: |
35 y = None | 35 y = None |
36 return x, y | 36 return x, y |
37 revs = revs and list(revs) or [] | 37 if revs: |
38 revs = list(revs) | |
39 else: | |
40 revs = [] | |
41 | |
38 if not peer.capable('branchmap'): | 42 if not peer.capable('branchmap'): |
39 if branches: | 43 if branches: |
40 raise util.Abort(_("remote branch lookup not supported")) | 44 raise util.Abort(_("remote branch lookup not supported")) |
41 revs.append(hashbranch) | 45 revs.append(hashbranch) |
42 return revs, revs[0] | 46 return revs, revs[0] |