2020-05-11 18:21:18 -04:00
|
|
|
/**
|
|
|
|
* @license
|
2020-05-19 15:08:49 -04:00
|
|
|
* Copyright Google LLC All Rights Reserved.
|
2020-05-11 18:21:18 -04:00
|
|
|
*
|
|
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
|
|
* found in the LICENSE file at https://angular.io/license
|
|
|
|
*/
|
|
|
|
|
2021-04-08 15:34:55 -04:00
|
|
|
import {types as graphqlTypes} from 'typed-graphqlify';
|
2020-05-11 18:21:18 -04:00
|
|
|
|
2021-03-24 19:17:15 -04:00
|
|
|
import {Commit} from '../../commit-message/parse';
|
|
|
|
import {getCommitsInRange} from '../../commit-message/utils';
|
2020-05-11 18:21:18 -04:00
|
|
|
import {getConfig, NgDevConfig} from '../../utils/config';
|
2020-05-20 17:32:04 -04:00
|
|
|
import {error, info, promptConfirm} from '../../utils/console';
|
2020-09-01 04:39:35 -04:00
|
|
|
import {addTokenToGitHttpsUrl} from '../../utils/git/github-urls';
|
2020-10-01 19:06:56 -04:00
|
|
|
import {GitClient} from '../../utils/git/index';
|
2020-05-11 18:21:18 -04:00
|
|
|
import {getPr} from '../../utils/github';
|
|
|
|
|
2021-04-08 15:34:55 -04:00
|
|
|
/* Graphql schema for the response body for each pending PR. */
|
2020-05-11 18:21:18 -04:00
|
|
|
const PR_SCHEMA = {
|
2021-04-08 15:34:55 -04:00
|
|
|
state: graphqlTypes.string,
|
|
|
|
maintainerCanModify: graphqlTypes.boolean,
|
|
|
|
viewerDidAuthor: graphqlTypes.boolean,
|
|
|
|
headRefOid: graphqlTypes.string,
|
2020-05-11 18:21:18 -04:00
|
|
|
headRef: {
|
2021-04-08 15:34:55 -04:00
|
|
|
name: graphqlTypes.string,
|
2020-05-11 18:21:18 -04:00
|
|
|
repository: {
|
2021-04-08 15:34:55 -04:00
|
|
|
url: graphqlTypes.string,
|
|
|
|
nameWithOwner: graphqlTypes.string,
|
2020-05-11 18:21:18 -04:00
|
|
|
},
|
|
|
|
},
|
|
|
|
baseRef: {
|
2021-04-08 15:34:55 -04:00
|
|
|
name: graphqlTypes.string,
|
2020-05-11 18:21:18 -04:00
|
|
|
repository: {
|
2021-04-08 15:34:55 -04:00
|
|
|
url: graphqlTypes.string,
|
|
|
|
nameWithOwner: graphqlTypes.string,
|
2020-05-11 18:21:18 -04:00
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Rebase the provided PR onto its merge target branch, and push up the resulting
|
|
|
|
* commit to the PRs repository.
|
|
|
|
*/
|
|
|
|
export async function rebasePr(
|
|
|
|
prNumber: number, githubToken: string, config: Pick<NgDevConfig, 'github'> = getConfig()) {
|
2021-04-08 15:34:55 -04:00
|
|
|
/** The singleton instance of the GitClient. */
|
|
|
|
const git = GitClient.getAuthenticatedInstance();
|
2020-05-11 18:21:18 -04:00
|
|
|
// TODO: Rely on a common assertNoLocalChanges function.
|
2020-05-27 18:39:31 -04:00
|
|
|
if (git.hasLocalChanges()) {
|
2020-05-20 17:32:04 -04:00
|
|
|
error('Cannot perform rebase of PR with local changes.');
|
2020-05-11 18:21:18 -04:00
|
|
|
process.exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2020-06-25 10:15:14 -04:00
|
|
|
* The branch or revision originally checked out before this method performed
|
|
|
|
* any Git operations that may change the working branch.
|
2020-05-11 18:21:18 -04:00
|
|
|
*/
|
2020-06-25 10:15:14 -04:00
|
|
|
const previousBranchOrRevision = git.getCurrentBranchOrRevision();
|
2020-05-11 18:21:18 -04:00
|
|
|
/* Get the PR information from Github. */
|
2020-08-14 19:49:07 -04:00
|
|
|
const pr = await getPr(PR_SCHEMA, prNumber, git);
|
2020-05-11 18:21:18 -04:00
|
|
|
|
2020-06-05 17:41:44 -04:00
|
|
|
const headRefName = pr.headRef.name;
|
|
|
|
const baseRefName = pr.baseRef.name;
|
|
|
|
const fullHeadRef = `${pr.headRef.repository.nameWithOwner}:${headRefName}`;
|
|
|
|
const fullBaseRef = `${pr.baseRef.repository.nameWithOwner}:${baseRefName}`;
|
2020-09-01 04:39:35 -04:00
|
|
|
const headRefUrl = addTokenToGitHttpsUrl(pr.headRef.repository.url, githubToken);
|
|
|
|
const baseRefUrl = addTokenToGitHttpsUrl(pr.baseRef.repository.url, githubToken);
|
2020-05-11 18:21:18 -04:00
|
|
|
|
2020-06-05 17:41:44 -04:00
|
|
|
// Note: Since we use a detached head for rebasing the PR and therefore do not have
|
|
|
|
// remote-tracking branches configured, we need to set our expected ref and SHA. This
|
|
|
|
// allows us to use `--force-with-lease` for the detached head while ensuring that we
|
|
|
|
// never accidentally override upstream changes that have been pushed in the meanwhile.
|
|
|
|
// See:
|
|
|
|
// https://git-scm.com/docs/git-push#Documentation/git-push.txt---force-with-leaseltrefnamegtltexpectgt
|
|
|
|
const forceWithLeaseFlag = `--force-with-lease=${headRefName}:${pr.headRefOid}`;
|
|
|
|
|
2020-05-11 18:21:18 -04:00
|
|
|
// If the PR does not allow maintainers to modify it, exit as the rebased PR cannot
|
|
|
|
// be pushed up.
|
|
|
|
if (!pr.maintainerCanModify && !pr.viewerDidAuthor) {
|
2020-05-20 17:32:04 -04:00
|
|
|
error(
|
2020-05-11 18:21:18 -04:00
|
|
|
`Cannot rebase as you did not author the PR and the PR does not allow maintainers` +
|
|
|
|
`to modify the PR`);
|
|
|
|
process.exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
|
|
// Fetch the branch at the commit of the PR, and check it out in a detached state.
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Checking out PR #${prNumber} from ${fullHeadRef}`);
|
2020-10-29 18:43:44 -04:00
|
|
|
git.run(['fetch', '-q', headRefUrl, headRefName]);
|
2020-11-17 13:08:40 -05:00
|
|
|
git.run(['checkout', '-q', '--detach', 'FETCH_HEAD']);
|
2020-05-11 18:21:18 -04:00
|
|
|
// Fetch the PRs target branch and rebase onto it.
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Fetching ${fullBaseRef} to rebase #${prNumber} on`);
|
2020-10-29 18:43:44 -04:00
|
|
|
git.run(['fetch', '-q', baseRefUrl, baseRefName]);
|
2020-11-17 13:08:40 -05:00
|
|
|
|
|
|
|
const commonAncestorSha = git.run(['merge-base', 'HEAD', 'FETCH_HEAD']).stdout.trim();
|
|
|
|
|
2021-03-24 19:17:15 -04:00
|
|
|
const commits = await getCommitsInRange(commonAncestorSha, 'HEAD');
|
2020-11-17 13:08:40 -05:00
|
|
|
|
2021-03-19 15:11:21 -04:00
|
|
|
let squashFixups = commits.filter((commit: Commit) => commit.isFixup).length === 0 ?
|
2020-11-17 13:08:40 -05:00
|
|
|
false :
|
|
|
|
await promptConfirm(
|
|
|
|
`PR #${prNumber} contains fixup commits, would you like to squash them during rebase?`,
|
|
|
|
true);
|
|
|
|
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Attempting to rebase PR #${prNumber} on ${fullBaseRef}`);
|
2020-11-17 13:08:40 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Tuple of flags to be added to the rebase command and env object to run the git command.
|
|
|
|
*
|
|
|
|
* Additional flags to perform the autosquashing are added when the user confirm squashing of
|
|
|
|
* fixup commits should occur.
|
|
|
|
*/
|
|
|
|
const [flags, env] = squashFixups ?
|
|
|
|
[['--interactive', '--autosquash'], {...process.env, GIT_SEQUENCE_EDITOR: 'true'}] :
|
|
|
|
[[], undefined];
|
|
|
|
const rebaseResult = git.runGraceful(['rebase', ...flags, 'FETCH_HEAD'], {env: env});
|
2020-05-11 18:21:18 -04:00
|
|
|
|
|
|
|
// If the rebase was clean, push the rebased PR up to the authors fork.
|
2020-06-05 17:41:44 -04:00
|
|
|
if (rebaseResult.status === 0) {
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Rebase was able to complete automatically without conflicts`);
|
|
|
|
info(`Pushing rebased PR #${prNumber} to ${fullHeadRef}`);
|
2020-06-05 17:41:44 -04:00
|
|
|
git.run(['push', headRefUrl, `HEAD:${headRefName}`, forceWithLeaseFlag]);
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Rebased and updated PR #${prNumber}`);
|
2020-09-29 19:06:50 -04:00
|
|
|
git.checkout(previousBranchOrRevision, true);
|
2020-05-11 18:21:18 -04:00
|
|
|
process.exit(0);
|
|
|
|
}
|
|
|
|
} catch (err) {
|
2020-05-20 17:32:04 -04:00
|
|
|
error(err.message);
|
2020-09-29 19:06:50 -04:00
|
|
|
git.checkout(previousBranchOrRevision, true);
|
2020-05-11 18:21:18 -04:00
|
|
|
process.exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
// On automatic rebase failures, prompt to choose if the rebase should be continued
|
|
|
|
// manually or aborted now.
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Rebase was unable to complete automatically without conflicts.`);
|
2020-05-11 18:21:18 -04:00
|
|
|
// If the command is run in a non-CI environment, prompt to format the files immediately.
|
|
|
|
const continueRebase =
|
|
|
|
process.env['CI'] === undefined && await promptConfirm('Manually complete rebase?');
|
|
|
|
|
|
|
|
if (continueRebase) {
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`After manually completing rebase, run the following command to update PR #${prNumber}:`);
|
2020-06-05 17:41:44 -04:00
|
|
|
info(` $ git push ${pr.headRef.repository.url} HEAD:${headRefName} ${forceWithLeaseFlag}`);
|
2020-05-20 17:32:04 -04:00
|
|
|
info();
|
|
|
|
info(`To abort the rebase and return to the state of the repository before this command`);
|
|
|
|
info(`run the following command:`);
|
2020-06-25 10:15:14 -04:00
|
|
|
info(` $ git rebase --abort && git reset --hard && git checkout ${previousBranchOrRevision}`);
|
2020-05-11 18:21:18 -04:00
|
|
|
process.exit(1);
|
|
|
|
} else {
|
2020-05-20 17:32:04 -04:00
|
|
|
info(`Cleaning up git state, and restoring previous state.`);
|
2020-05-11 18:21:18 -04:00
|
|
|
}
|
|
|
|
|
2020-09-29 19:06:50 -04:00
|
|
|
git.checkout(previousBranchOrRevision, true);
|
2020-05-11 18:21:18 -04:00
|
|
|
process.exit(1);
|
|
|
|
}
|