equal
deleted
inserted
replaced
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 |
629 if not os.path.split(mapfile)[0]: |
629 if not os.path.split(mapfile)[0]: |
630 mapname = templater.templatepath( |
630 (mapname, fp) = templater.open_template( |
631 b'map-cmdline.' + mapfile |
631 b'map-cmdline.' + mapfile |
632 ) or templater.templatepath(mapfile) |
632 ) or templater.open_template(mapfile) |
633 if mapname: |
633 if mapname: |
634 mapfile = mapname |
634 mapfile = mapname |
635 return formatter.mapfile_templatespec(b'changeset', 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) |