OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gcc-changelog: fix when somebody reverts a backport

Browse Source 
contrib/ChangeLog:

	* gcc-changelog/git_commit.py: When reverting a backport,
	we should print only Revert header.
This commit is contained in:
Martin Liska 2020-07-23 10:39:00 +02:00
parent 2ca1b6d009
commit 02cada26e4
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/gcc-changelog/git_commit.py
View File

@ -628,7 +628,11 @@ class GitCommit:
for entry in self.changelog_entries:
output = ''
timestamp = entry.datetime
if self.cherry_pick_commit:
if self.revert_commit:
timestamp = current_timestamp
orig_date = self.original_info.date
current_timestamp = orig_date.strftime(DATE_FORMAT)
elif self.cherry_pick_commit:
info = self.commit_to_info_hook(self.cherry_pick_commit)
# it can happen that it is a cherry-pick for a different
# repository
@ -636,10 +640,6 @@ class GitCommit:
timestamp = info.date.strftime(DATE_FORMAT)
else:
timestamp = current_timestamp
elif self.revert_commit:
timestamp = current_timestamp
orig_date = self.original_info.date
current_timestamp = orig_date.strftime(DATE_FORMAT)
elif not timestamp or use_commit_ts:
timestamp = current_timestamp
authors = entry.authors if entry.authors else [self.info.author]
@ -649,12 +649,13 @@ class GitCommit:
authors.append(author)
if self.cherry_pick_commit or self.revert_commit:
output += self.format_authors_in_changelog([self.info.author],
original_author = self.original_info.author
output += self.format_authors_in_changelog([original_author],
current_timestamp)
if self.cherry_pick_commit:
output += '\tBackported from master:\n'
else:
if self.revert_commit:
output += '\tRevert:\n'
else:
output += '\tBackported from master:\n'
output += self.format_authors_in_changelog(authors,
timestamp, '\t')
else: