FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

contrib/gcc-changelog: Check whether revert-commit exists

Browse source 
contrib/ChangeLog:

	* gcc-changelog/git_commit.py (GitCommit.__init__):
	Handle commit_to_info_hook = None; otherwise, if None,
	regard it as error.
	(to_changelog_entries): Handle commit_to_info_hook = None;
	if info is None, create a warning for it.
	* gcc-changelog/git_email.py (GitEmail.__init__):
	call super() with commit_to_info_hook=None instead
	of a lamda function.
This commit is contained in:
Tobias Burnus 2023-09-07 12:35:02 +02:00
parent 1aee5d2ace
commit ff20bce9f5
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
contrib/gcc-changelog/git_commit.py
View file

@ -329,11 +329,15 @@ class GitCommit:
self.revert_commit = m.group('hash')
break
if self.revert_commit:
# The following happens for get_email.py:
if not self.commit_to_info_hook:
self.warnings.append(f"Invoked script can not obtain info about "
f"reverted commits such as '{self.revert_commit}'")
return
self.info = self.commit_to_info_hook(self.revert_commit)
# The following happens for get_email.py:
if not self.info:
return
if not self.info:
self.errors.append(Error('Cannot find to-be-reverted commit', self.revert_commit))
return
self.check_commit_email()
@ -796,12 +800,18 @@ class GitCommit:
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)
info = (self.commit_to_info_hook
and self.commit_to_info_hook(self.cherry_pick_commit))
# it can happen that it is a cherry-pick for a different
# repository
if info:
timestamp = info.date.strftime(DATE_FORMAT)
else:
if self.commit_to_info_hook:
self.warnings.append(f"Cherry-picked commit not found: '{self.cherry_pick_commit}'")
else:
self.warnings.append(f"Invoked script can not obtain info about "
f"cherry-picked commits such as '{self.revert_commit}'")
timestamp = current_timestamp
elif not timestamp or use_commit_ts:
timestamp = current_timestamp

3
contrib/gcc-changelog/git_email.py
View file

@ -89,8 +89,7 @@ class GitEmail(GitCommit):
t = 'M'
modified_files.append((target if t != 'D' else source, t))
git_info = GitInfo(None, date, author, message, modified_files)
super().__init__(git_info,
commit_to_info_hook=lambda x: None)
super().__init__(git_info, commit_to_info_hook=None)
def show_help():