equal
deleted
inserted
replaced
283 # TODO: do not depend on templater |
283 # TODO: do not depend on templater |
284 tres = formatter.templateresources(self.repo.ui, self.repo) |
284 tres = formatter.templateresources(self.repo.ui, self.repo) |
285 t = formatter.maketemplater(self.repo.ui, '{join(obsfate, "\n")}', |
285 t = formatter.maketemplater(self.repo.ui, '{join(obsfate, "\n")}', |
286 defaults=templatekw.keywords, |
286 defaults=templatekw.keywords, |
287 resources=tres) |
287 resources=tres) |
288 obsfate = t.render({'ctx': ctx, 'revcache': {}}).splitlines() |
288 obsfate = t.renderdefault({'ctx': ctx, 'revcache': {}}).splitlines() |
289 |
289 |
290 if obsfate: |
290 if obsfate: |
291 for obsfateline in obsfate: |
291 for obsfateline in obsfate: |
292 self.ui.write(self._columns['obsolete'] % obsfateline, |
292 self.ui.write(self._columns['obsolete'] % obsfateline, |
293 label='log.obsfate') |
293 label='log.obsfate') |
856 tres['cache'] = displayer._getcache |
856 tres['cache'] = displayer._getcache |
857 templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords, |
857 templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords, |
858 resources=tres) |
858 resources=tres) |
859 def formatnode(repo, ctx): |
859 def formatnode(repo, ctx): |
860 props = {'ctx': ctx, 'repo': repo, 'revcache': {}} |
860 props = {'ctx': ctx, 'repo': repo, 'revcache': {}} |
861 return templ.render(props) |
861 return templ.renderdefault(props) |
862 return formatnode |
862 return formatnode |
863 |
863 |
864 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None): |
864 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None): |
865 props = props or {} |
865 props = props or {} |
866 formatnode = _graphnodeformatter(ui, displayer) |
866 formatnode = _graphnodeformatter(ui, displayer) |