Mercurial > hg
comparison mercurial/bookmarks.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 | d8e0c591781c |
children | 3f6bf9f29e7b |
comparison
equal
deleted
inserted
replaced
24305:867c3649be5d | 24306:6ddc86eedc3b |
---|---|
433 smarks = src.listkeys('bookmarks') | 433 smarks = src.listkeys('bookmarks') |
434 dmarks = dst.listkeys('bookmarks') | 434 dmarks = dst.listkeys('bookmarks') |
435 | 435 |
436 diff = sorted(set(smarks) - set(dmarks)) | 436 diff = sorted(set(smarks) - set(dmarks)) |
437 for k in diff: | 437 for k in diff: |
438 mark = ui.debugflag and smarks[k] or smarks[k][:12] | 438 if ui.debugflag: |
439 mark = smarks[k] | |
440 else: | |
441 mark = smarks[k][:12] | |
439 ui.write(" %-25s %s\n" % (k, mark)) | 442 ui.write(" %-25s %s\n" % (k, mark)) |
440 | 443 |
441 if len(diff) <= 0: | 444 if len(diff) <= 0: |
442 ui.status(_("no changed bookmarks found\n")) | 445 ui.status(_("no changed bookmarks found\n")) |
443 return 1 | 446 return 1 |