diff options
| author | Martin Liska <mliska@suse.cz> | 2020-07-23 10:39:00 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2020-07-23 10:43:25 +0200 |
| commit | 02cada26e4783b4bfeaf6512a6c22df24d7a25fc (patch) | |
| tree | a48069d286d29aba58c71b068968a68832d4642b /contrib/gcc-changelog | |
| parent | 2ca1b6d009b194286c3ec91f9c51cc6b0a475458 (diff) | |
gcc-changelog: fix when somebody reverts a backport
contrib/ChangeLog:
* gcc-changelog/git_commit.py: When reverting a backport,
we should print only Revert header.
Diffstat (limited to 'contrib/gcc-changelog')
| -rwxr-xr-x | contrib/gcc-changelog/git_commit.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 827976c2f84..5a9cc4c7563 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -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: |