diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-14 15:38:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-20 20:44:31 +0000 |
| commit | 078af4082b9ca00e16074c054e813274eeb08b83 (patch) | |
| tree | d6836af58a3c33ba01db6257eb7ebc7c960d512a | |
| parent | c04a2492fe54776a58d72f34282a05e5f9e1158d (diff) | |
Revert "create_changelog.py: Reduce bug-fix release commits appearing in minor version logs"
This reverts commit 7ec3ab49fb4cfe7bd062507b15c57644d7032726.
The change was done in the wrong place, it only worked for [ChangeLog]
entries. The script actually has an option for excluding Pick-to; it
just needs to be set.
Pick-to: 6.2 5.15
Change-Id: I6cc5e929d4f2f9402eb214c87ae40c049f968f3a
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
(cherry picked from commit c47bc0eea7348020d748f67555f60542ff496c0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ef65ff55624b1ac428cb9363ec28e462f3435f12)
| -rw-r--r-- | tools/create_changelog.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/create_changelog.py b/tools/create_changelog.py index 70d72f595..acb5b9a42 100644 --- a/tools/create_changelog.py +++ b/tools/create_changelog.py @@ -280,14 +280,9 @@ def extract_change_log(commit_message: List[str]) -> Tuple[str, int, str]: return (component, task_nr_int, format_text(result)) -def create_change_log(versions: List[str], release_type: str) -> None: +def create_change_log(versions: List[str]) -> None: for sha in git_get_sha1s(versions, r"\[ChangeLog\]"): - commit_message = get_commit_content(sha) - # For major/minor releases, skip all fixes with - # "Pick-to: " since they appear in bug-fix releases - if release_type != "bug-fix" and "Pick-to: " in commit_message: - continue - change_log = extract_change_log(commit_message.splitlines()) + change_log = extract_change_log(get_commit_content(sha).splitlines()) component, task_nr, text = change_log if component.startswith('shiboken'): shiboken6_changelogs.append((task_nr, text)) @@ -336,7 +331,7 @@ if __name__ == "__main__": if check_tag(versions[0]) and check_tag(versions[1]): create_fixes_log(versions) create_task_log(versions) - create_change_log(versions, args.type) + create_change_log(versions) # Sort commits pyside6_commits = sort_dict(pyside6_commits) |