mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-28 22:34:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcc-changelog: support merge commits in git_update_version

Browse Source 
contrib/ChangeLog:

	* gcc-changelog/git_update_version.py: Support merge commits
	and walk only on the branch that is being merged and generate
	missing ChangeLog entries.
This commit is contained in:
Martin Liska 2020-06-18 14:14:24 +02:00
parent 3870268b27
commit 2c53566539
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/gcc-changelog/git_update_version.py
View File

@ -81,15 +81,23 @@ def update_current_branch():
if (commit.author.email == 'gccadmin@gcc.gnu.org'
and commit.message.strip() == 'Daily bump.'):
break
commit = commit.parents[0]
# We support merge commits but only with 2 parensts
assert len(commit.parents) <= 2
commit = commit.parents[-1]
commit_count += 1
print('%d revisions since last Daily bump' % commit_count)
datestamp_path = os.path.join(args.git_path, 'gcc/DATESTAMP')
if (read_timestamp(datestamp_path) != current_timestamp
or args.dry_mode or args.current):
commits = parse_git_revisions(args.git_path, '%s..HEAD'
% commit.hexsha)
head = repo.head.commit
# if HEAD is a merge commit, start with second parent
# (branched that is being merged into the current one)
assert len(head.parents) <= 2
if len(head.parents) == 2:
head = head.parents[1]
commits = parse_git_revisions(args.git_path, '%s..%s'
% (commit.hexsha, head.hexsha))
for git_commit in reversed(commits):
prepend_to_changelog_files(repo, args.git_path, git_commit,
not args.dry_mode)