# HG changeset patch # User Anton Shestakov # Date 1512743234 -28800 # Node ID 1fe3c8296cfe28834e259dec5f39760c60fd3b5d # Parent c67fb3bfe3a1a43d38e1dffc8c7cdc301029f80f hgweb: rewrite `template = A and B or C` to be a proper ternary operator diff -r c67fb3bfe3a1 -r 1fe3c8296cfe mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Wed Dec 06 18:37:49 2017 -0800 +++ b/mercurial/hgweb/webcommands.py Fri Dec 08 22:27:14 2017 +0800 @@ -413,7 +413,7 @@ else: nextentry = [] - return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav, + return tmpl('shortlog' if shortlog else 'changelog', changenav=changenav, node=ctx.hex(), rev=pos, symrev=symrev, changesets=count, entries=entries, latestentry=latestentry, nextentry=nextentry, diff -r c67fb3bfe3a1 -r 1fe3c8296cfe mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py Wed Dec 06 18:37:49 2017 -0800 +++ b/mercurial/hgweb/webutil.py Fri Dec 08 22:27:14 2017 +0800 @@ -411,7 +411,7 @@ files = [] parity = paritygen(web.stripecount) for blockno, f in enumerate(ctx.files()): - template = f in ctx and 'filenodelink' or 'filenolink' + template = 'filenodelink' if f in ctx else 'filenolink' files.append(tmpl(template, node=ctx.hex(), file=f, blockno=blockno + 1, parity=next(parity))) @@ -572,7 +572,7 @@ fileno = 0 for filename, adds, removes, isbinary in stats: - template = filename in files and 'diffstatlink' or 'diffstatnolink' + template = 'diffstatlink' if filename in files else 'diffstatnolink' total = adds + removes fileno += 1 yield tmpl(template, node=ctx.hex(), file=filename, fileno=fileno,