Commit bda888e9 authored by juga's avatar juga
Browse files

fix: Use rst changelog template

and put in the same entry commit subject and body removing new lines.

Closes: #40004
parent 8cfd9978
...@@ -187,7 +187,8 @@ unreleased_version_label = "Unreleased" ...@@ -187,7 +187,8 @@ unreleased_version_label = "Unreleased"
## Examples: ## Examples:
## - makotemplate("restructuredtext") ## - makotemplate("restructuredtext")
## ##
output_engine = rest_py #output_engine = rest_py
output_engine = makotemplate(".gitchangelogrst.tpl")
#output_engine = mustache("restructuredtext") #output_engine = mustache("restructuredtext")
#output_engine = mustache("markdown") #output_engine = mustache("markdown")
#output_engine = makotemplate("restructuredtext") #output_engine = makotemplate("restructuredtext")
......
...@@ -19,15 +19,11 @@ ${section["label"]} ...@@ -19,15 +19,11 @@ ${section["label"]}
${"~" * len(section["label"])} ${"~" * len(section["label"])}
% endif % endif
% for commit in section["commits"]: % for commit in section["commits"]:
<% <% c = commit["subject"]
subject = "%s [%s]" % (commit["subject"], ", ".join(commit["authors"])) if commit["body"]:
entry = indent('\n'.join(textwrap.wrap(subject)), c += "\n" + commit["body"].replace("\n\n", "\n")
first="- ").strip() entry = indent(c, first="- ").strip()
%>${entry} %>${entry}
% if commit["body"]:
${indent(commit["body"])}
% endif
% endfor % endfor
% endfor % endfor
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment