From 925ee0ac8ecfd43aa219f6bad04b3b7e90d0b76d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 12 Jun 2023 16:40:35 +0300 Subject: utils: checkstyle: Don't include commit ID in commit title The commit title and commit ID are two different pieces of information. Don't include the latter in the former, to simplify code that only needs the commit title. Constructing a string from the ID and title is easier than splitting the combined string back into its elements. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- utils/checkstyle.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'utils') diff --git a/utils/checkstyle.py b/utils/checkstyle.py index 3104acfa..e68c8746 100755 --- a/utils/checkstyle.py +++ b/utils/checkstyle.py @@ -210,12 +210,12 @@ class Commit: def _parse(self): # Get the commit title and list of files. - ret = subprocess.run(['git', 'show', '--pretty=oneline', '--name-status', + ret = subprocess.run(['git', 'show', '--format=%s', '--name-status', self.commit], stdout=subprocess.PIPE).stdout.decode('utf-8') - files = ret.splitlines() - self._files = [CommitFile(f) for f in files[1:]] - self._title = files[0] + lines = ret.splitlines() + self._files = [CommitFile(f) for f in lines[1:] if f] + self._title = lines[0] def files(self, filter='AMR'): return [f.filename for f in self._files if f.status in filter] @@ -358,7 +358,7 @@ class HeaderAddChecker(CommitChecker): class TitleChecker(CommitChecker): - prefix_regex = re.compile(r'[0-9a-f]+ (([a-zA-Z0-9_.-]+: )+)') + prefix_regex = re.compile(r'^([a-zA-Z0-9_.-]+: )+') release_regex = re.compile(r'libcamera v[0-9]+\.[0-9]+\.[0-9]+') @classmethod @@ -388,7 +388,7 @@ class TitleChecker(CommitChecker): if not prefix: continue - prefix = prefix.group(1) + prefix = prefix.group(0) if prefix in prefixes: prefixes[prefix] += 1 else: @@ -846,9 +846,10 @@ def check_file(top_level, commit, filename, checkers): def check_style(top_level, commit, checkers): - separator = '-' * len(commit.title) + title = commit.commit + ' ' + commit.title + separator = '-' * len(title) print(separator) - print(commit.title) + print(title) print(separator) issues = 0 -- cgit v1.2.1