Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for backporting multiple PRs at once #395

Merged
merged 2 commits into from
Jun 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/entrypoint.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export async function getCommits(options: {
maxNumber?: number;
onlyMissing?: boolean;
prFilter?: string;
pullNumber?: number;
pullNumber?: number | number[];
sha?: string | string[];
skipRemoteConfig?: boolean;
sourceBranch?: string;
Expand All @@ -77,13 +77,19 @@ export async function getCommits(options: {
const optionsFromGithub = await getOptionsFromGithub(options);

if (options.pullNumber) {
return [
await fetchCommitByPullNumber({
...optionsFromGithub,
...options,
pullNumber: options.pullNumber,
}),
];
const pullNumbers = Array.isArray(options.pullNumber)
? options.pullNumber
: [options.pullNumber];

return Promise.all(
pullNumbers.map((pullNumber) =>
fetchCommitByPullNumber({
...optionsFromGithub,
...options,
pullNumber,
})
)
);
}

if (options.sha) {
Expand Down
31 changes: 20 additions & 11 deletions src/lib/getCommits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,40 +22,49 @@ export async function getCommits(options: ValidConfigOptions) {
try {
if (options.sha) {
const shas = Array.isArray(options.sha) ? options.sha : [options.sha];

// TODO: use Intl.ListFormat to format the sha's
spinner.text = `Loading commit "${shas.map(getShortSha)}"`;

const commits = await Promise.all(
shas.map((sha) => fetchCommitBySha({ ...options, sha }))
);

spinner.stopAndPersist(
getOraPersistsOption(
'Select commit',
commits.map((commit) => commit.sourceCommit.message).join(', ')
commits
.map((commit) => getFirstLine(commit.sourceCommit.message))
.join(', ')
)
);

return commits;
}

if (options.pullNumber) {
spinner.text = `Loading pull request #${options.pullNumber}`;
const commit = await fetchCommitByPullNumber({
...options,
pullNumber: options.pullNumber, // must extract pullNumber to satisfy the ts gods
});
const pullNumbers = Array.isArray(options.pullNumber)
? options.pullNumber
: [options.pullNumber];

spinner.text = `Loading pull request #${pullNumbers
.map((pullNumber) => `#${pullNumber}`)
.join(', ')}`;

const commits = await Promise.all(
pullNumbers.map((pullNumber) =>
fetchCommitByPullNumber({ ...options, pullNumber })
)
);

// add styles to make it look like a prompt question
spinner.stopAndPersist(
getOraPersistsOption(
'Select pull request',
getFirstLine(commit.sourceCommit.message)
commits
.map((commit) => getFirstLine(commit.sourceCommit.message))
.join(', ')
)
);

return [commit];
return commits;
}

if (!options.interactive && !options.ls) {
Expand Down
2 changes: 1 addition & 1 deletion src/options/ConfigOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ type Options = Partial<{
publishStatusCommentOnAbort: boolean;
publishStatusCommentOnFailure: boolean;
publishStatusCommentOnSuccess: boolean;
pullNumber: number;
pullNumber: number | number[];
repoForkOwner: string;
repoName: string;
repoOwner: string;
Expand Down