github/opencommit
1
1
Fork 0
mirror of https://github.com/di-sukharev/opencommit.git synced 2026-04-20 03:02:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

build

Browse Source
This commit is contained in:
di-sukharev
2023-05-20 13:48:11 +08:00
parent be06729ad8
commit d6219478fc
2 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
out/github-action.cjs
View File

@@ -27919,25 +27919,25 @@ async function getCommitDiff(commitSha) {
);
return { sha: commitSha, diff: diffResponse.data };
}
async function improveCommitMessagesWithRebase(commits) {
async function improveCommitMessagesWithRebase(commits, diffs) {
let commitsToImprove = pattern ? commits.filter(({ commit }) => new RegExp(pattern).test(commit.message)) : commits;
if (!commitsToImprove.length) {
ce("No new commits found.");
return;
}
ce(`Found ${commitsToImprove.length} commits to improve.`);
const commitShas = commitsToImprove.map((commit) => commit.sha);
const diffPromises = commitShas.map((sha) => getCommitDiff(sha));
ce("Fetching commit diffs by SHAs.");
const commitDiffsAndSHAs = await Promise.all(
diffPromises
).catch((error) => {
ce(`error in Promise.all(getCommitDiffs(SHAs)): ${error}`);
throw error;
});
ce("Done.");
if (!diffs) {
const commitShas = commitsToImprove.map((commit) => commit.sha);
const diffPromises = commitShas.map((sha) => getCommitDiff(sha));
ce("Fetching commit diffs by SHAs.");
diffs = await Promise.all(diffPromises).catch((error) => {
ce(`error in Promise.all(getCommitDiffs(SHAs)): ${error}`);
throw error;
});
ce("Done.");
}
ce("Improving commit messages by diffs.");
const improvePromises = commitDiffsAndSHAs.map(
const improvePromises = diffs.map(
(commit) => generateCommitMessageByDiff(commit.diff)
);
async function improveMessagesInChunks() {
@@ -27948,7 +27948,7 @@ async function improveCommitMessagesWithRebase(commits) {
await Promise.all(promises).then((results) => {
return results.reduce((acc, improvedMsg, i3) => {
const index = Object.keys(improvedMessagesBySha2).length;
acc[commitDiffsAndSHAs[index + i3].sha] = improvedMsg;
acc[diffs[index + i3].sha] = improvedMsg;
return acc;
}, improvedMessagesBySha2);
}).catch((error) => {
@@ -27961,14 +27961,21 @@ async function improveCommitMessagesWithRebase(commits) {
}
return improvedMessagesBySha2;
}
const improvedMessagesBySha = await improveMessagesInChunks();
let improvedMessagesBySha = {};
try {
improvedMessagesBySha = await improveMessagesInChunks();
} catch (error) {
ce(error);
ce("retrying");
await improveCommitMessagesWithRebase(commits, diffs);
return;
}
console.log({ improvedMessagesBySha });
ce("Done.");
ce(
`Starting interactive rebase: "$ rebase -i ${commitsToImprove[0].parents[0].sha}".`
);
await execa("git", ["fetch", "origin", "master"]);
await execa("git", ["rebase", "-i", commitsToImprove[0].parents[0].sha]);
await execa("git", ["rebase", "-i", `${commitsToImprove[0].sha}^`]);
for (const commit of commitsToImprove) {
try {
const commitDiff = improvedMessagesBySha[commit.sha];

44
src/github-action.ts
View File

@@ -42,7 +42,10 @@ async function getCommitDiff(commitSha: string) {
return { sha: commitSha, diff: diffResponse.data };
}
async function improveCommitMessagesWithRebase(commits: CommitsArray) {
async function improveCommitMessagesWithRebase(
commits: CommitsArray,
diffs?: { sha: string; diff: string }[]
): Promise<void> {
let commitsToImprove = pattern
? commits.filter(({ commit }) => new RegExp(pattern).test(commit.message))
: commits;
@@ -55,20 +58,21 @@ async function improveCommitMessagesWithRebase(commits: CommitsArray) {
outro(`Found ${commitsToImprove.length} commits to improve.`);
const commitShas = commitsToImprove.map((commit) => commit.sha);
const diffPromises = commitShas.map((sha) => getCommitDiff(sha));
if (!diffs) {
const commitShas = commitsToImprove.map((commit) => commit.sha);
const diffPromises = commitShas.map((sha) => getCommitDiff(sha));
outro('Fetching commit diffs by SHAs.');
const commitDiffsAndSHAs: { sha: string; diff: string }[] = await Promise.all(
diffPromises
).catch((error) => {
outro(`error in Promise.all(getCommitDiffs(SHAs)): ${error}`);
throw error;
});
outro('Done.');
outro('Fetching commit diffs by SHAs.');
diffs = await Promise.all(diffPromises).catch((error) => {
outro(`error in Promise.all(getCommitDiffs(SHAs)): ${error}`);
throw error;
});
outro('Done.');
}
outro('Improving commit messages by diffs.');
const improvePromises = commitDiffsAndSHAs.map((commit) =>
const improvePromises = diffs.map((commit) =>
generateCommitMessageByDiff(commit.diff)
);
@@ -84,7 +88,7 @@ async function improveCommitMessagesWithRebase(commits: CommitsArray) {
.then((results) => {
return results.reduce((acc, improvedMsg, i) => {
const index = Object.keys(improvedMessagesBySha).length;
acc[commitDiffsAndSHAs[index + i].sha] = improvedMsg;
acc[diffs![index + i].sha] = improvedMsg;
return acc;
}, improvedMessagesBySha);
@@ -103,7 +107,16 @@ async function improveCommitMessagesWithRebase(commits: CommitsArray) {
return improvedMessagesBySha;
}
const improvedMessagesBySha = await improveMessagesInChunks();
let improvedMessagesBySha: MessageBySha = {};
try {
improvedMessagesBySha = await improveMessagesInChunks();
} catch (error) {
outro(error as string);
outro('retrying');
await improveCommitMessagesWithRebase(commits, diffs);
return;
}
console.log({ improvedMessagesBySha });
@@ -113,8 +126,7 @@ async function improveCommitMessagesWithRebase(commits: CommitsArray) {
`Starting interactive rebase: "$ rebase -i ${commitsToImprove[0].parents[0].sha}".`
);
await execa('git', ['fetch', 'origin', 'master']);
await execa('git', ['rebase', '-i', commitsToImprove[0].parents[0].sha]);
await execa('git', ['rebase', '-i', `${commitsToImprove[0].sha}^`]);
for (const commit of commitsToImprove) {
try {