diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-01 14:54:29 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-05 07:52:25 +0200 |
| commit | 7ec3ab49fb4cfe7bd062507b15c57644d7032726 (patch) | |
| tree | 9c1d6a09667d37497b3e46fbbed44c7845a01533 /tools/create_changelog.py | |
| parent | 55dd4740f6067facb1c86c7a149a7e0acbf51fd0 (diff) | |
create_changelog.py: Reduce bug-fix release commits appearing in minor version logs
Remove commits with "Pick-to " for non-bugfix releases.
Pick-to: 6.5 6.2 5.15
Change-Id: I1d6456b413e51578a7ac8020df64245a76848d63
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'tools/create_changelog.py')
| -rw-r--r-- | tools/create_changelog.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/create_changelog.py b/tools/create_changelog.py index 2fdc2743f..91f165724 100644 --- a/tools/create_changelog.py +++ b/tools/create_changelog.py @@ -226,9 +226,14 @@ 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]) -> None: +def create_change_log(versions: List[str], release_type: str) -> None: for sha in git_get_sha1s(versions, r"\[ChangeLog\]"): - change_log = extract_change_log(get_commit_content(sha).splitlines()) + 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()) component, task_nr, text = change_log if component.startswith('shiboken'): shiboken6_changelogs.append((task_nr, text)) @@ -277,7 +282,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) + create_change_log(versions, args.type) # Sort commits pyside6_commits = sort_dict(pyside6_commits) |