diff options
| author | Gaëtan Gilbert | 2020-05-26 12:40:25 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-05-26 12:40:25 +0200 |
| commit | 1eb5f0504561224affd93717a9fca0e3162dcdd9 (patch) | |
| tree | c5e3f203d65a9f25b90aa85117061fec6cb6c9e6 | |
| parent | 7a72315423042108a4594556f55a3d0ed168a687 (diff) | |
| parent | 09a4ffe1d2add78c0773fb1d1d1313835ac71095 (diff) | |
Merge PR #12410: dev/tools/make-changelog.sh now asks about fixed bugs
Reviewed-by: SkySkimmer
Ack-by: Zimmi48
| -rwxr-xr-x | dev/tools/make-changelog.sh | 8 | ||||
| -rw-r--r-- | doc/changelog/08-tools/12410-add-fixes.rst | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/dev/tools/make-changelog.sh b/dev/tools/make-changelog.sh index e1aed4560d..de58527cca 100755 --- a/dev/tools/make-changelog.sh +++ b/dev/tools/make-changelog.sh @@ -25,11 +25,17 @@ case "$type_first_letter" in exit 1;; esac +printf "Fixes? (space separated list of bug numbers)\n" +read -r fixes_list + +fixes_string="$(echo $fixes_list | sed 's/ /~ and /g; s,\([0-9]\+\),`#\1 <https://github.com/coq/coq/issues/\1>`_,g' | tr '~' '\n')" +if [ ! -z "$fixes_string" ]; then fixes_string="$(printf '\n fixes %s,' "$fixes_string")"; fi + # shellcheck disable=SC2016 # the ` are regular strings, this is intended # use %s for the leading - to avoid looking like an option (not sure # if necessary but doesn't hurt) -printf '%s **%s:**\n Bla bla\n (`#%s <https://github.com/coq/coq/pull/%s>`_,\n by %s).' - "$type_full" "$PR" "$PR" "$(git config user.name)" > "$where" +printf '%s **%s:**\n Bla bla\n (`#%s <https://github.com/coq/coq/pull/%s>`_,%s\n by %s).' - "$type_full" "$PR" "$PR" "$fixes_string" "$(git config user.name)" > "$where" printf "Name of created changelog file:\n" printf "$where\n" diff --git a/doc/changelog/08-tools/12410-add-fixes.rst b/doc/changelog/08-tools/12410-add-fixes.rst new file mode 100644 index 0000000000..f4c41dc3c3 --- /dev/null +++ b/doc/changelog/08-tools/12410-add-fixes.rst @@ -0,0 +1,4 @@ +- **Changed:** + ``dev/tools/make-changelog.sh`` now asks for a list of bugs fixed by the PR + (`#12410 <https://github.com/coq/coq/pull/12410>`_, fixes `#12386 + <https://github.com/coq/coq/issues/12386>`_, by Jason Gross). |