Mercurial > hg
comparison hgext/convert/convcmd.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 | c497e39d81a3 |
children | 603a8d09e12d |
comparison
equal
deleted
inserted
replaced
24305:867c3649be5d | 24306:6ddc86eedc3b |
---|---|
513 | 513 |
514 sortmodes = ('branchsort', 'datesort', 'sourcesort', 'closesort') | 514 sortmodes = ('branchsort', 'datesort', 'sourcesort', 'closesort') |
515 sortmode = [m for m in sortmodes if opts.get(m)] | 515 sortmode = [m for m in sortmodes if opts.get(m)] |
516 if len(sortmode) > 1: | 516 if len(sortmode) > 1: |
517 raise util.Abort(_('more than one sort mode specified')) | 517 raise util.Abort(_('more than one sort mode specified')) |
518 sortmode = sortmode and sortmode[0] or defaultsort | 518 if sortmode: |
519 sortmode = sortmode[0] | |
520 else: | |
521 sortmode = defaultsort | |
522 | |
519 if sortmode == 'sourcesort' and not srcc.hasnativeorder(): | 523 if sortmode == 'sourcesort' and not srcc.hasnativeorder(): |
520 raise util.Abort(_('--sourcesort is not supported by this data source')) | 524 raise util.Abort(_('--sourcesort is not supported by this data source')) |
521 if sortmode == 'closesort' and not srcc.hasnativeclose(): | 525 if sortmode == 'closesort' and not srcc.hasnativeclose(): |
522 raise util.Abort(_('--closesort is not supported by this data source')) | 526 raise util.Abort(_('--closesort is not supported by this data source')) |
523 | 527 |