equal
deleted
inserted
replaced
2359 newtree = templater.expandaliases(tree, aliases) |
2359 newtree = templater.expandaliases(tree, aliases) |
2360 if newtree != tree: |
2360 if newtree != tree: |
2361 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n') |
2361 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n') |
2362 |
2362 |
2363 if revs is None: |
2363 if revs is None: |
2364 t = formatter.maketemplater(ui, tmpl) |
2364 tres = formatter.templateresources(ui, repo) |
2365 props['ui'] = ui |
2365 t = formatter.maketemplater(ui, tmpl, resources=tres) |
2366 ui.write(t.render(props)) |
2366 ui.write(t.render(props)) |
2367 else: |
2367 else: |
2368 displayer = cmdutil.makelogtemplater(ui, repo, tmpl) |
2368 displayer = cmdutil.makelogtemplater(ui, repo, tmpl) |
2369 for r in revs: |
2369 for r in revs: |
2370 displayer.show(repo[r], **pycompat.strkwargs(props)) |
2370 displayer.show(repo[r], **pycompat.strkwargs(props)) |