diff -r e7d3b509af8b -r 08a0f04b56bd mercurial/templatekw.py --- a/mercurial/templatekw.py Mon Jan 25 00:05:22 2010 -0600 +++ b/mercurial/templatekw.py Mon Jan 25 00:05:27 2010 -0600 @@ -29,7 +29,8 @@ expand 'end_foos'. ''' templ = args['templ'] - if plural: names = plural + if plural: + names = plural else: names = name + 's' if not values: noname = 'no_' + names @@ -188,7 +189,7 @@ rename = getrenamed(fn, ctx.rev()) if rename: copies.append((fn, rename[0])) - + c = [{'name': x[0], 'source': x[1]} for x in copies] return showlist('file_copy', c, plural='file_copies', **args)