honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(dev-infra): use common git client for git environment reset (#39051) 

For rebase tooling, use the `GitClient`'s `checkout` method rather than a custom
function doing the same task.

PR Close #39051
This commit is contained in:
Joey Perrott 2020-09-29 16:06:50 -07:00 committed by Alex Rickabaugh
parent 31e42f0947
commit c8d757624b
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dev-infra/pr/rebase/index.ts
View File

@ -7,7 +7,6 @@
*/ */
import {types as graphQLTypes} from 'typed-graphqlify'; import {types as graphQLTypes} from 'typed-graphqlify';
import {URL} from 'url';
import {getConfig, NgDevConfig} from '../../utils/config'; import {getConfig, NgDevConfig} from '../../utils/config';
import {error, info, promptConfirm} from '../../utils/console'; import {error, info, promptConfirm} from '../../utils/console';
@ -100,12 +99,12 @@ export async function rebasePr(
info(`Pushing rebased PR #${prNumber} to ${fullHeadRef}`); info(`Pushing rebased PR #${prNumber} to ${fullHeadRef}`);
git.run(['push', headRefUrl, `HEAD:${headRefName}`, forceWithLeaseFlag]); git.run(['push', headRefUrl, `HEAD:${headRefName}`, forceWithLeaseFlag]);
info(`Rebased and updated PR #${prNumber}`); info(`Rebased and updated PR #${prNumber}`);
cleanUpGitState(); git.checkout(previousBranchOrRevision, true);
process.exit(0); process.exit(0);
} }
} catch (err) { } catch (err) {
error(err.message); error(err.message);
cleanUpGitState(); git.checkout(previousBranchOrRevision, true);
process.exit(1); process.exit(1);
} }
@ -128,16 +127,6 @@ export async function rebasePr(
info(`Cleaning up git state, and restoring previous state.`); info(`Cleaning up git state, and restoring previous state.`);
} }
cleanUpGitState(); git.checkout(previousBranchOrRevision, true);
process.exit(1); process.exit(1);
/** Reset git back to the original branch. */
function cleanUpGitState() {
// Ensure that any outstanding rebases are aborted.
git.runGraceful(['rebase', '--abort'], {stdio: 'ignore'});
// Ensure that any changes in the current repo state are cleared.
git.runGraceful(['reset', '--hard'], {stdio: 'ignore'});
// Checkout the original branch from before the run began.
git.runGraceful(['checkout', previousBranchOrRevision], {stdio: 'ignore'});
}
} }