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

fix(dev-infra): run fetches in the git client in quiet mode (#39503) 

When fetch is run in normal mode, the `git-fetch-pack` plumbing command
outputs progress to stderr.  Since this is unnecessary progress
information for ng-dev usages, it should be suppressed instead.

PR Close #39503
This commit is contained in:
Joey Perrott 2020-10-29 15:43:44 -07:00
parent db1c48ff36
commit be64f98076
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev-infra/ng-dev.js
View File

@ -2765,7 +2765,7 @@ function checkOutPullRequestLocally(prNumber, githubToken, opts = {}) {
try { try {
// Fetch the branch at the commit of the PR, and check it out in a detached state. // Fetch the branch at the commit of the PR, and check it out in a detached state.
info(`Checking out PR #${prNumber} from ${fullHeadRef}`); info(`Checking out PR #${prNumber} from ${fullHeadRef}`);
git.run(['fetch', headRefUrl, headRefName]); git.run(['fetch', '-q', headRefUrl, headRefName]);
git.run(['checkout', '--detach', 'FETCH_HEAD']); git.run(['checkout', '--detach', 'FETCH_HEAD']);
} }
catch (e) { catch (e) {
@ -3453,7 +3453,7 @@ var MergeStrategy = /** @class */ (function () {
}); });
// Fetch all target branches with a single command. We don't want to fetch them // Fetch all target branches with a single command. We don't want to fetch them
// individually as that could cause an unnecessary slow-down. // individually as that could cause an unnecessary slow-down.
this.git.run(tslib.__spread(['fetch', '-f', this.git.repoGitUrl], fetchRefspecs, extraRefspecs)); this.git.run(tslib.__spread(['fetch', '-q', '-f', this.git.repoGitUrl], fetchRefspecs, extraRefspecs));
}; };
/** Pushes the given target branches upstream. */ /** Pushes the given target branches upstream. */
MergeStrategy.prototype.pushTargetBranchesUpstream = function (names) { MergeStrategy.prototype.pushTargetBranchesUpstream = function (names) {
@ -4174,11 +4174,11 @@ function rebasePr(prNumber, githubToken, config = getConfig()) {
try { try {
// Fetch the branch at the commit of the PR, and check it out in a detached state. // Fetch the branch at the commit of the PR, and check it out in a detached state.
info(`Checking out PR #${prNumber} from ${fullHeadRef}`); info(`Checking out PR #${prNumber} from ${fullHeadRef}`);
git.run(['fetch', headRefUrl, headRefName]); git.run(['fetch', '-q', headRefUrl, headRefName]);
git.run(['checkout', '--detach', 'FETCH_HEAD']); git.run(['checkout', '--detach', 'FETCH_HEAD']);
// Fetch the PRs target branch and rebase onto it. // Fetch the PRs target branch and rebase onto it.
info(`Fetching ${fullBaseRef} to rebase #${prNumber} on`); info(`Fetching ${fullBaseRef} to rebase #${prNumber} on`);
git.run(['fetch', baseRefUrl, baseRefName]); git.run(['fetch', '-q', baseRefUrl, baseRefName]);
info(`Attempting to rebase PR #${prNumber} on ${fullBaseRef}`); info(`Attempting to rebase PR #${prNumber} on ${fullBaseRef}`);
const rebaseResult = git.runGraceful(['rebase', 'FETCH_HEAD']); const rebaseResult = git.runGraceful(['rebase', 'FETCH_HEAD']);
// If the rebase was clean, push the rebased PR up to the authors fork. // If the rebase was clean, push the rebased PR up to the authors fork.
@ -5498,7 +5498,7 @@ class ReleaseAction {
/** Checks out an upstream branch with a detached head. */ /** Checks out an upstream branch with a detached head. */
checkoutUpstreamBranch(branchName) { checkoutUpstreamBranch(branchName) {
return tslib.__awaiter(this, void 0, void 0, function* () { return tslib.__awaiter(this, void 0, void 0, function* () {
this.git.run(['fetch', this.git.repoGitUrl, branchName]); this.git.run(['fetch', '-q', this.git.repoGitUrl, branchName]);
this.git.run(['checkout', 'FETCH_HEAD', '--detach']); this.git.run(['checkout', 'FETCH_HEAD', '--detach']);
}); });
} }

2
dev-infra/pr/common/checkout-pr.ts
View File

@ -102,7 +102,7 @@ export async function checkOutPullRequestLocally(
try { try {
// Fetch the branch at the commit of the PR, and check it out in a detached state. // Fetch the branch at the commit of the PR, and check it out in a detached state.
info(`Checking out PR #${prNumber} from ${fullHeadRef}`); info(`Checking out PR #${prNumber} from ${fullHeadRef}`);
git.run(['fetch', headRefUrl, headRefName]); git.run(['fetch', '-q', headRefUrl, headRefName]);
git.run(['checkout', '--detach', 'FETCH_HEAD']); git.run(['checkout', '--detach', 'FETCH_HEAD']);
} catch (e) { } catch (e) {
git.checkout(previousBranchOrRevision, true); git.checkout(previousBranchOrRevision, true);

2
dev-infra/pr/merge/strategies/strategy.ts
View File

@ -124,7 +124,7 @@ export abstract class MergeStrategy {
}); });
// Fetch all target branches with a single command. We don't want to fetch them // Fetch all target branches with a single command. We don't want to fetch them
// individually as that could cause an unnecessary slow-down. // individually as that could cause an unnecessary slow-down.
this.git.run(['fetch', '-f', this.git.repoGitUrl, ...fetchRefspecs, ...extraRefspecs]); this.git.run(['fetch', '-q', '-f', this.git.repoGitUrl, ...fetchRefspecs, ...extraRefspecs]);
} }
/** Pushes the given target branches upstream. */ /** Pushes the given target branches upstream. */

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

@ -84,12 +84,12 @@ export async function rebasePr(
try { try {
// Fetch the branch at the commit of the PR, and check it out in a detached state. // Fetch the branch at the commit of the PR, and check it out in a detached state.
info(`Checking out PR #${prNumber} from ${fullHeadRef}`); info(`Checking out PR #${prNumber} from ${fullHeadRef}`);
git.run(['fetch', headRefUrl, headRefName]); git.run(['fetch', '-q', headRefUrl, headRefName]);
git.run(['checkout', '--detach', 'FETCH_HEAD']); git.run(['checkout', '--detach', 'FETCH_HEAD']);
// Fetch the PRs target branch and rebase onto it. // Fetch the PRs target branch and rebase onto it.
info(`Fetching ${fullBaseRef} to rebase #${prNumber} on`); info(`Fetching ${fullBaseRef} to rebase #${prNumber} on`);
git.run(['fetch', baseRefUrl, baseRefName]); git.run(['fetch', '-q', baseRefUrl, baseRefName]);
info(`Attempting to rebase PR #${prNumber} on ${fullBaseRef}`); info(`Attempting to rebase PR #${prNumber} on ${fullBaseRef}`);
const rebaseResult = git.runGraceful(['rebase', 'FETCH_HEAD']); const rebaseResult = git.runGraceful(['rebase', 'FETCH_HEAD']);

2
dev-infra/release/publish/actions.ts
View File

@ -350,7 +350,7 @@ export abstract class ReleaseAction {
/** Checks out an upstream branch with a detached head. */ /** Checks out an upstream branch with a detached head. */
protected async checkoutUpstreamBranch(branchName: string) { protected async checkoutUpstreamBranch(branchName: string) {
this.git.run(['fetch', this.git.repoGitUrl, branchName]); this.git.run(['fetch', '-q', this.git.repoGitUrl, branchName]);
this.git.run(['checkout', 'FETCH_HEAD', '--detach']); this.git.run(['checkout', 'FETCH_HEAD', '--detach']);
} }

2
dev-infra/utils/testing/virtual-git-client.ts
View File

@ -105,7 +105,7 @@ export class VirtualGitClient extends GitClient {
/** Handler for the `git fetch` command. */ /** Handler for the `git fetch` command. */
private _fetch(rawArgs: string[]) { private _fetch(rawArgs: string[]) {
const args = parseArgs(rawArgs, {boolean: ['f', 'force']}); const args = parseArgs(rawArgs, {boolean: ['f', 'force', 'q', 'quiet']});
const [repoUrl, refspec] = args._; const [repoUrl, refspec] = args._;
const force = args['f'] || args['force']; const force = args['f'] || args['force'];
const ref = this._unwrapRefspec(refspec); const ref = this._unwrapRefspec(refspec);