equal
deleted
inserted
replaced
626 |
626 |
627 if not tmpl and style: |
627 if not tmpl and style: |
628 mapfile = style |
628 mapfile = style |
629 fp = None |
629 fp = None |
630 if not os.path.split(mapfile)[0]: |
630 if not os.path.split(mapfile)[0]: |
631 (mapname, fp) = templater.open_template( |
631 (mapname, fp) = templater.try_open_template( |
632 b'map-cmdline.' + mapfile |
632 b'map-cmdline.' + mapfile |
633 ) or templater.open_template(mapfile) |
633 ) or templater.try_open_template(mapfile) |
634 if mapname: |
634 if mapname: |
635 mapfile = mapname |
635 mapfile = mapname |
636 return formatter.mapfile_templatespec(b'changeset', mapfile, fp) |
636 return formatter.mapfile_templatespec(b'changeset', mapfile, fp) |
637 |
637 |
638 return formatter.lookuptemplate(ui, b'changeset', tmpl) |
638 return formatter.lookuptemplate(ui, b'changeset', tmpl) |