From 881810aa42eb88d82648fc58ccd19d1276ec61de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Tue, 22 Nov 2022 16:15:34 +0100
Subject: [PATCH] elections: Go through project branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We've been ingoring branches of projects, and with that simply ignoring
contributors to stable releases, and to efforts like Confidential
Containers, runtime-rs, Peer Pods, etc.

Fixes: #310

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 elections/tools/generate_electorate.py | 81 +++++++++++++-------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/elections/tools/generate_electorate.py b/elections/tools/generate_electorate.py
index 57efc07fec..2272d2faf8 100755
--- a/elections/tools/generate_electorate.py
+++ b/elections/tools/generate_electorate.py
@@ -108,52 +108,53 @@ for repo in org.repositories():
           (repo, start_time, end_time))
 
     authors = AuthorSet()
-    for commit in repo.commits(since=start_time, until=end_time,
-                               number=number):
-        if commit.author is None:
-            if commit.commit.author is None:
-                print('Skipping %s in %s as it has no author. Did this merge via GitHub?' %
-                      (commit, repo))
-                continue
-
-            author_id = commit.commit.author.get('email')
-            print('%s in %s as has no author. Using email (%s) as the author id' %
-                  (commit, repo, author_id))
-        else:
-            author_id = commit.author.login
-
-        if author_id not in author_cache:
+    for branch in repo.branches():
+        for commit in repo.commits(sha=branch.name, since=start_time, until=end_time,
+                                   number=number):
             if commit.author is None:
-                author = Author(author_id, email=author_id,
-                                name=commit.commit.author.get('name'))
+                if commit.commit.author is None:
+                    print('Skipping %s in %s as it has no author. Did this merge via GitHub?' %
+                          (commit, repo))
+                    continue
+
+                author_id = commit.commit.author.get('email')
+                print('%s in %s as has no author. Using email (%s) as the author id' %
+                      (commit, repo, author_id))
             else:
-                _author = gh.user(commit.author.login)
-                author = Author(_author.login, email=_author.email,
-                                name=_author.name)
+                author_id = commit.author.login
 
-            author_cache[author_id] = author
+            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 = author_cache[author_id]
-        author.commit_count += 1
+                author_cache[author_id] = author
 
-        # If the GitHub account doesn't have a name or email address
-        # the author *may* have included it in their git config.
-        if author.email is None and commit.commit.author.get('email'):
-            author.email = commit.commit.author.get('email')
-        if author.name is None and commit.commit.author.get('name'):
-            author.name = commit.commit.author.get('name')
+            author = author_cache[author_id]
+            author.commit_count += 1
 
-        # last ditch effort did the author use a valid email address in the
-        # DCO line?
-        match = dco_re.search(commit.message)
-        if match:
-            if ((author.email is None or
-                    'users.noreply.github.com' in author.email) and
-                    match.group('email')):
-                author.email = match.group('email')
-            if author.name is None and match.group('name'):
-                author.name = match.group('name')
-        authors.add(author)
+            # If the GitHub account doesn't have a name or email address
+            # the author *may* have included it in their git config.
+            if author.email is None and commit.commit.author.get('email'):
+                author.email = commit.commit.author.get('email')
+            if author.name is None and commit.commit.author.get('name'):
+                author.name = commit.commit.author.get('name')
+
+            # last ditch effort did the author use a valid email address in the
+            # DCO line?
+            match = dco_re.search(commit.message)
+            if match:
+                if ((author.email is None or
+                        'users.noreply.github.com' in author.email) and
+                        match.group('email')):
+                    author.email = match.group('email')
+                if author.name is None and match.group('name'):
+                    author.name = match.group('name')
+            authors.add(author)
     projects.append({str(repo): authors})
 
 # Dark YAML voodoo