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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
69e3983acf
commit
925ee0ac8e
1 changed files with 9 additions and 8 deletions
|
@ -210,12 +210,12 @@ class Commit:
|
||||||
|
|
||||||
def _parse(self):
|
def _parse(self):
|
||||||
# Get the commit title and list of files.
|
# 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],
|
self.commit],
|
||||||
stdout=subprocess.PIPE).stdout.decode('utf-8')
|
stdout=subprocess.PIPE).stdout.decode('utf-8')
|
||||||
files = ret.splitlines()
|
lines = ret.splitlines()
|
||||||
self._files = [CommitFile(f) for f in files[1:]]
|
self._files = [CommitFile(f) for f in lines[1:] if f]
|
||||||
self._title = files[0]
|
self._title = lines[0]
|
||||||
|
|
||||||
def files(self, filter='AMR'):
|
def files(self, filter='AMR'):
|
||||||
return [f.filename for f in self._files if f.status in filter]
|
return [f.filename for f in self._files if f.status in filter]
|
||||||
|
@ -358,7 +358,7 @@ class HeaderAddChecker(CommitChecker):
|
||||||
|
|
||||||
|
|
||||||
class TitleChecker(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]+')
|
release_regex = re.compile(r'libcamera v[0-9]+\.[0-9]+\.[0-9]+')
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -388,7 +388,7 @@ class TitleChecker(CommitChecker):
|
||||||
if not prefix:
|
if not prefix:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
prefix = prefix.group(1)
|
prefix = prefix.group(0)
|
||||||
if prefix in prefixes:
|
if prefix in prefixes:
|
||||||
prefixes[prefix] += 1
|
prefixes[prefix] += 1
|
||||||
else:
|
else:
|
||||||
|
@ -846,9 +846,10 @@ def check_file(top_level, commit, filename, checkers):
|
||||||
|
|
||||||
|
|
||||||
def check_style(top_level, commit, checkers):
|
def check_style(top_level, commit, checkers):
|
||||||
separator = '-' * len(commit.title)
|
title = commit.commit + ' ' + commit.title
|
||||||
|
separator = '-' * len(title)
|
||||||
print(separator)
|
print(separator)
|
||||||
print(commit.title)
|
print(title)
|
||||||
print(separator)
|
print(separator)
|
||||||
|
|
||||||
issues = 0
|
issues = 0
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue