Mercurial > public > mercurial-scm > hg
comparison mercurial/debugcommands.py @ 31517:468bc8a1863d
debugtemplate: pass ui to templater so label() works
Follows up 3356bf61fa25.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 18 Mar 2017 19:59:47 +0900 |
parents | 53865692a354 |
children | b71143b10f74 |
comparison
equal
deleted
inserted
replaced
31515:527a247f114f | 31517:468bc8a1863d |
---|---|
2017 | 2017 |
2018 props = {} | 2018 props = {} |
2019 for d in opts['define']: | 2019 for d in opts['define']: |
2020 try: | 2020 try: |
2021 k, v = (e.strip() for e in d.split('=', 1)) | 2021 k, v = (e.strip() for e in d.split('=', 1)) |
2022 if not k: | 2022 if not k or k == 'ui': |
2023 raise ValueError | 2023 raise ValueError |
2024 props[k] = v | 2024 props[k] = v |
2025 except ValueError: | 2025 except ValueError: |
2026 raise error.Abort(_('malformed keyword definition: %s') % d) | 2026 raise error.Abort(_('malformed keyword definition: %s') % d) |
2027 | 2027 |
2035 | 2035 |
2036 mapfile = None | 2036 mapfile = None |
2037 if revs is None: | 2037 if revs is None: |
2038 k = 'debugtemplate' | 2038 k = 'debugtemplate' |
2039 t = formatter.maketemplater(ui, k, tmpl) | 2039 t = formatter.maketemplater(ui, k, tmpl) |
2040 ui.write(templater.stringify(t(k, **props))) | 2040 ui.write(templater.stringify(t(k, ui=ui, **props))) |
2041 else: | 2041 else: |
2042 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl, | 2042 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl, |
2043 mapfile, buffered=False) | 2043 mapfile, buffered=False) |
2044 for r in revs: | 2044 for r in revs: |
2045 displayer.show(repo[r], **props) | 2045 displayer.show(repo[r], **props) |