mercurial-scm/hg: mercurial/commands.py comparison

comparison mercurial/commands.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	0b94b68aace9
children	fefcafda10b8

comparison

equal deleted inserted replaced

-:867c3649be5d
+:6ddc86eedc3b
 # --follow is deprecated and now just an alias for -f/--file
 # to mimic the behavior of Mercurial before version 1.5
 opts['file'] = True
 fm = ui.formatter('annotate', opts)
-datefunc = ui.quiet and util.shortdate or util.datestr
+if ui.quiet:
+datefunc = util.shortdate
+else:
+datefunc = util.datestr
 hexfn = fm.hexfunc
 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
 ('number', ' ', lambda x: x[0].rev(), str),
 ('changeset', ' ', lambda x: hexfn(x[0].node()), str),
 def extendbisectrange(nodes, good):
 # bisect is incomplete when it ends on a merge node and
 # one of the parent was not checked.
 parents = repo[nodes[0]].parents()
 if len(parents) > 1:
-side = good and state['bad'] or state['good']
+if good:
+side = state['bad']
+else:
+side = state['good']
 num = len(set(i.node() for i in parents) & set(side))
 if num == 1:
 return parents[0].ancestor(parents[1])
 return None
 for i in xrange(blo, bhi):
 yield ('+', b[i])
 def display(fn, ctx, pstates, states):
 rev = ctx.rev()
-datefunc = ui.quiet and util.shortdate or util.datestr
+if ui.quiet:
+datefunc = util.shortdate
+else:
+datefunc = util.datestr
 found = False
 @util.cachefunc
 def binary():
 flog = getfile(fn)
 return util.binary(flog.read(ctx.filenode(fn)))
 if not repo and not source:
 raise util.Abort(_("there is no Mercurial repository here "
 "(.hg not found)"))
-hexfunc = ui.debugflag and hex or short
+if ui.debugflag:
+hexfunc = hex
+else:
+hexfunc = short
 default = not (num or id or branch or tags or bookmarks)
 output = []
 revs = []
 if source:
 See :hg:`help files` for a more versatile command.
 Returns 0 if a match is found, 1 otherwise.
 """
-end = opts.get('print0') and '\0' or '\n'
+if opts.get('print0'):
+end = '\0'
+else:
+end = '\n'
 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
 ret = 1
 ctx = repo[rev]
 m = scmutil.match(ctx, pats, opts, default='relglob')
 copies = []
 for fn in ctx.files():
 rename = getrenamed(fn, rev)
 if rename:
 copies.append((fn, rename[0]))
-revmatchfn = filematcher and filematcher(ctx.rev()) or None
+if filematcher:
+revmatchfn = filematcher(ctx.rev())
+else:
+revmatchfn = None
 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
 if displayer.flush(rev):
 count += 1
 displayer.close()
 # this way we can check if something was given in the command-line
 if opts.get('port'):
 opts['port'] = util.getport(opts.get('port'))
-baseui = repo and repo.baseui or ui
+if repo:
+baseui = repo.baseui
+else:
+baseui = ui
 optlist = ("name templates style address port prefix ipv6"
 " accesslog errorlog certificate encoding")
 for o in optlist.split():
 val = opts.get(o, '')
 if val in (None, ''): # should check against default options instead
 node2 = scmutil.revsingle(repo, change, None).node()
 node1 = repo[node2].p1().node()
 else:
 node1, node2 = scmutil.revpair(repo, revs)
-cwd = (pats and repo.getcwd()) or ''
+if pats:
-end = opts.get('print0') and '\0' or '\n'
+cwd = repo.getcwd()
+else:
+cwd = ''
+if opts.get('print0'):
+end = '\0'
+else:
+end = '\n'
 copy = {}
 states = 'modified added removed deleted unknown ignored clean'.split()
 show = [k for k in states if opts.get(k)]
 if opts.get('all'):
 show += ui.quiet and (states[:4] + ['clean']) or states
 if not show:
-show = ui.quiet and states[:4] or states[:5]
+if ui.quiet:
+show = states[:4]
+else:
+show = states[:5]
 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
 'ignored' in show, 'clean' in show, 'unknown' in show,
 opts.get('subrepos'))
 changestates = zip(states, 'MAR!?IC', stat)
 raise util.Abort(_("--rev and --remove are incompatible"))
 if opts.get('rev'):
 rev_ = opts['rev']
 message = opts.get('message')
 if opts.get('remove'):
-expectedtype = opts.get('local') and 'local' or 'global'
+if opts.get('local'):
+expectedtype = 'local'
+else:
+expectedtype = 'global'
 for n in names:
 if not repo.tagtype(n):
 raise util.Abort(_("tag '%s' does not exist") % n)
 if repo.tagtype(n) != expectedtype:
 if expectedtype == 'global':

Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 24306:6ddc86eedc3b