# HG changeset patch # User Yuya Nishihara # Date 1491395264 -32400 # Node ID 579bbcb4322b0547e1f9ae8951c6ca9a5f7bc956 # Parent 0e9fece17db1455738e2285b1b08d6ab29e6dfb8 templatekw: eliminate unnecessary temporary variable 'names' from _showlist() Replace 'names' with the optional argument 'plural'. diff -r 0e9fece17db1 -r 579bbcb4322b mercurial/templatekw.py --- a/mercurial/templatekw.py Mon Apr 17 20:22:00 2017 +0200 +++ b/mercurial/templatekw.py Wed Apr 05 21:27:44 2017 +0900 @@ -106,11 +106,10 @@ expand 'end_foos'. ''' templ = args['templ'] - if plural: - names = plural - else: names = name + 's' + if not plural: + plural = name + 's' if not values: - noname = 'no_' + names + noname = 'no_' + plural if noname in templ: yield templ(noname, **args) return @@ -121,7 +120,7 @@ for v in values: yield dict(v, **args) return - startname = 'start_' + names + startname = 'start_' + plural if startname in templ: yield templ(startname, **args) vargs = args.copy() @@ -144,7 +143,7 @@ yield one(v) if last is not None: yield one(last, tag=lastname) - endname = 'end_' + names + endname = 'end_' + plural if endname in templ: yield templ(endname, **args)