github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-26 19:48:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #307 from sameo/main

Browse Source 
tools: Only skip commits when the core git commit is incomplete
This commit is contained in:
Fabiano Fidêncio 2022-11-21 22:15:37 +01:00 committed by GitHub
commit bc74b60a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
elections/tools/generate_electorate.py
View File

@ -23,8 +23,8 @@ def _authorset_representer(dumper, data):
class Author(object): class Author(object):
def __init__(self, login, name=None, email=None): def __init__(self, id, name=None, email=None):
self.login = login self.id = id
self.name = name self.name = name
self._emails = set() self._emails = set()
if email: if email:
@ -44,17 +44,17 @@ class Author(object):
self._emails.add(email) self._emails.add(email)
def __eq__(self, other): def __eq__(self, other):
return self.login == other.login return self.id == other.id
def __lt__(self, other): def __lt__(self, other):
return self.login < other.login return self.id < other.id
def __hash__(self): def __hash__(self):
return hash(self.login) return hash(self.id)
def _author_representer(dumper, data): def _author_representer(dumper, data):
o_dict = OrderedDict(github_id=data.login, o_dict = OrderedDict(github_id=data.id,
name=data.name, name=data.name,
email=data.email, email=data.email,
# _emails is a private member and we probably # _emails is a private member and we probably
@ -95,19 +95,29 @@ for repo in org.repositories():
for commit in repo.commits(since=start_time, until=end_time, for commit in repo.commits(since=start_time, until=end_time,
number=number): number=number):
if commit.author is None: if commit.author is None:
print('%s in %s has no author did this merge via GitHub?' % if commit.commit.author is None:
(commit, repo)) print('Skipping %s in %s as it has no author. Did this merge via GitHub?' %
print('%s Appears to be from: %s' % (commit, repo))
(commit, commit.commit.author)) continue
continue
if commit.author.login not in author_cache: author_id = commit.commit.author.get('email')
_author = gh.user(commit.author.login) print('%s in %s as has no author. Using email (%s) as the author id' %
author = Author(_author.login, email=_author.email, (commit, repo, author_id))
name=_author.name) else:
author_cache[commit.author.login] = author author_id = commit.author.login
author = author_cache[commit.author.login] if author_id not in author_cache:
if commit.author is None:
author = Author(author_id, email=author_id,
name=commit.commit.author.get('name'))
else:
_author = gh.user(commit.author.login)
author = Author(_author.login, email=_author.email,
name=_author.name)
author_cache[author_id] = author
author = author_cache[author_id]
author.commit_count += 1 author.commit_count += 1
# If the GitHub account doesn't have a name or email address # If the GitHub account doesn't have a name or email address