618 |
618 |
619 # ui settings |
619 # ui settings |
620 if not tmpl and not style: # template are stronger than style |
620 if not tmpl and not style: # template are stronger than style |
621 tmpl = ui.config(b'ui', b'logtemplate') |
621 tmpl = ui.config(b'ui', b'logtemplate') |
622 if tmpl: |
622 if tmpl: |
623 return templatespec(templater.unquotestring(tmpl), None) |
623 return formatter.literal_templatespec(templater.unquotestring(tmpl)) |
624 else: |
624 else: |
625 style = util.expandpath(ui.config(b'ui', b'style')) |
625 style = util.expandpath(ui.config(b'ui', b'style')) |
626 |
626 |
627 if not tmpl and style: |
627 if not tmpl and style: |
628 mapfile = style |
628 mapfile = style |
630 mapname = templater.templatepath( |
630 mapname = templater.templatepath( |
631 b'map-cmdline.' + mapfile |
631 b'map-cmdline.' + mapfile |
632 ) or templater.templatepath(mapfile) |
632 ) or templater.templatepath(mapfile) |
633 if mapname: |
633 if mapname: |
634 mapfile = mapname |
634 mapfile = mapname |
635 return templatespec(None, mapfile) |
635 return formatter.mapfile_templatespec(b'changeset', mapfile) |
636 |
636 |
637 return formatter.lookuptemplate(ui, b'changeset', tmpl) |
637 return formatter.lookuptemplate(ui, b'changeset', tmpl) |
638 |
638 |
639 |
639 |
640 def maketemplater(ui, repo, tmpl, buffered=False): |
640 def maketemplater(ui, repo, tmpl, buffered=False): |
641 """Create a changesettemplater from a literal template 'tmpl' |
641 """Create a changesettemplater from a literal template 'tmpl' |
642 byte-string.""" |
642 byte-string.""" |
643 spec = templatespec(tmpl, None) |
643 spec = formatter.literal_templatespec(tmpl) |
644 return changesettemplater(ui, repo, spec, buffered=buffered) |
644 return changesettemplater(ui, repo, spec, buffered=buffered) |
645 |
645 |
646 |
646 |
647 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False): |
647 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False): |
648 """show one changeset using template or regular display. |
648 """show one changeset using template or regular display. |