Show More
@@ -1646,7 +1646,7 b' class changeset_templater(changeset_prin' | |||||
1646 | self.footer = templater.stringify( |
|
1646 | self.footer = templater.stringify( | |
1647 | self.t(self._parts['footer'], **props)) |
|
1647 | self.t(self._parts['footer'], **props)) | |
1648 |
|
1648 | |||
1649 |
def g |
|
1649 | def _lookuplogtemplate(ui, tmpl, style): | |
1650 | """ |
|
1650 | """ | |
1651 | Find the template matching the given template spec or style. |
|
1651 | Find the template matching the given template spec or style. | |
1652 | """ |
|
1652 | """ | |
@@ -1692,7 +1692,8 b' def show_changeset(ui, repo, opts, buffe' | |||||
1692 | if opts.get('template') == 'json': |
|
1692 | if opts.get('template') == 'json': | |
1693 | return jsonchangeset(ui, repo, matchfn, opts, buffered) |
|
1693 | return jsonchangeset(ui, repo, matchfn, opts, buffered) | |
1694 |
|
1694 | |||
1695 |
|
|
1695 | spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style')) | |
|
1696 | tmpl, mapfile = spec | |||
1696 |
|
1697 | |||
1697 | if not tmpl and not mapfile: |
|
1698 | if not tmpl and not mapfile: | |
1698 | return changeset_printer(ui, repo, matchfn, opts, buffered) |
|
1699 | return changeset_printer(ui, repo, matchfn, opts, buffered) | |
@@ -2944,7 +2945,7 b' def commitforceeditor(repo, ctx, subs, f' | |||||
2944 |
|
2945 | |||
2945 | def buildcommittemplate(repo, ctx, subs, extramsg, tmpl): |
|
2946 | def buildcommittemplate(repo, ctx, subs, extramsg, tmpl): | |
2946 | ui = repo.ui |
|
2947 | ui = repo.ui | |
2947 |
tmpl, mapfile = g |
|
2948 | tmpl, mapfile = _lookuplogtemplate(ui, tmpl, None) | |
2948 |
|
2949 | |||
2949 | t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False) |
|
2950 | t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False) | |
2950 |
|
2951 |
General Comments 0
You need to be logged in to leave comments.
Login now