equal
deleted
inserted
replaced
846 if ctx.node() is None: |
846 if ctx.node() is None: |
847 ctx = ctx.p1() |
847 ctx = ctx.p1() |
848 |
848 |
849 props = {b'ctx': ctx} |
849 props = {b'ctx': ctx} |
850 templateresult = template.renderdefault(props) |
850 templateresult = template.renderdefault(props) |
851 input.label_detail = templateresult.splitlines()[0] # split for safety |
851 input.label_detail = stringutil.firstline(templateresult) # avoid '\n' |
852 |
852 |
853 |
853 |
854 def _populate_label_details(repo, inputs, tool=None): |
854 def _populate_label_details(repo, inputs, tool=None): |
855 """Populates the label details using the conflict marker template.""" |
855 """Populates the label details using the conflict marker template.""" |
856 ui = repo.ui |
856 ui = repo.ui |