diff --git a/tools/find-inactive-collaborators.mjs b/tools/find-inactive-collaborators.mjs index 7a647475602..1dfa9c960c7 100755 --- 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) {