diff --git a/contrib/gitchangelog/changelog.rc.py b/contrib/gitchangelog/changelog.rc.py index e2fd2cf42e..7f8182a574 100644 --- a/contrib/gitchangelog/changelog.rc.py +++ b/contrib/gitchangelog/changelog.rc.py @@ -158,14 +158,13 @@ body_process = ( ReSub(r"\n*See merge request isc-private/bind9!\d+", r"") | ReSub(r"https://gitlab.isc.org/isc-projects/bind9/-/issues/", r"#") | ReSub(r"https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/", r"!") + | ReSub(r"\n*Backport of [^\n]+", r"") + | ReSub(r"\n*(Replaces|Supersedes)[^\n]+", r"") | ReSub( r"\n*(Closes|Fixes|Related|See):?\s*(isc-projects/bind9)?((#|!)\d+)", r" :gl:`\3`", ) - | ReSub(r"\n*Backport of [^\n]+", r"") - | ReSub(r"\n*(Replaces|Supersedes)[^\n]+", r"") | ReSub(r"\n*Merge branch '[^']+' into [^\n]+", r"") - | ReSub(r"\n*isc-private/bind9", r"") | ReSub(r"\n*See merge request isc-projects/bind9(!\d+)", r" :gl:`\1`") | Wrap(regexp="\n\n", separator="\n\n") | strip diff --git a/contrib/gitchangelog/relnotes.rc.py b/contrib/gitchangelog/relnotes.rc.py index dd1a8722c5..8430c7f70c 100644 --- a/contrib/gitchangelog/relnotes.rc.py +++ b/contrib/gitchangelog/relnotes.rc.py @@ -39,14 +39,13 @@ body_process = ( ReSub(r"\n*See merge request isc-private/bind9!\d+", r"") | ReSub(r"https://gitlab.isc.org/isc-projects/bind9/-/issues/", r"#") | ReSub(r"https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/", r"!") + | ReSub(r"\n*Backport of [^\n]+", r"") + | ReSub(r"\n*(Replaces|Supercedes)[^\n]+", r"") | ReSub( r"\n*(Closes|Fixes|Related|See):?\s*(isc-projects/bind9)?((#|!)\d+)", r" :gl:`\3`", ) - | ReSub(r"\n*Backport of [^\n]+", r"") - | ReSub(r"\n*(Replaces|Supercedes)[^\n]+", r"") | ReSub(r"\n*Merge branch '[^']+' into [^\n]+", r"") - | ReSub(r"\n*isc-private/bind9", r"") | ReSub(r"\n*See merge request isc-projects/bind9(!\d+)", r" :gl:`\1`") | Wrap(regexp="\n\n", separator="\n\n") | strip