tools: take co-authors into account in find-inactive-collaborators

aduh95 · aduh95 · commit db421bdefc31 · 2024-04-29T22:46:32.000+02:00
PR-URL: #52669 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
diff --git a/tools/find-inactive-collaborators.mjs b/tools/find-inactive-collaborators.mjs
@@ -47,16 +47,10 @@ async function runGitCommand(cmd, mapFn) {
   return Promise.race([errorHandler, Promise.resolve(returnValue)]);
 }
 
-// Get all commit authors during the time period.
-const authors = await runGitCommand(
-  `git shortlog -n -s --email --since="${SINCE}" HEAD`,
-  (line) => line.trim().split('\t', 2)[1],
-);
-
-// Get all approving reviewers of landed commits during the time period.
-const approvingReviewers = await runGitCommand(
-  `git log --since="${SINCE}" | egrep "^    Reviewed-By: "`,
-  (line) => /^ {4}Reviewed-By: ([^<]+)/.exec(line)[1].trim(),
+// Get all commit contributors during the time period.
+const contributors = await runGitCommand(
+  `git log --pretty='format:%aN <%aE>%n%(trailers:only,valueonly,key=Co-authored-by)%n%(trailers:only,valueonly,key=Reviewed-by)' --since="${SINCE}" HEAD`,
+  String,
 );
 
 async function getCollaboratorsFromReadme() {
@@ -185,13 +179,11 @@ const collaborators = await getCollaboratorsFromReadme();
 
 if (verbose) {
   console.log(`Since ${SINCE}:\n`);
-  console.log(`* ${authors.size.toLocaleString()} authors have made commits.`);
-  console.log(`* ${approvingReviewers.size.toLocaleString()} reviewers have approved landed commits.`);
+  console.log(`* ${contributors.size.toLocaleString()} contributors`);
   console.log(`* ${collaborators.length.toLocaleString()} collaborators currently in the project.`);
 }
 const inactive = collaborators.filter((collaborator) =>
-  !authors.has(collaborator.mailmap) &&
-  !approvingReviewers.has(collaborator.name),
+  !contributors.has(collaborator.mailmap),
 );
 
 if (inactive.length) {
