From 8e555ec39e30b1ef6df1fc9e1a628b867115deba Mon Sep 17 00:00:00 2001 From: Vallie Joseph Date: Thu, 1 Dec 2022 15:56:41 +0000 Subject: [PATCH] . --- dist/index.js | 32 +++++++++++++++++++++----------- src/git-command-manager.ts | 29 ++++++++++++++++++----------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dist/index.js b/dist/index.js index 54cd2c4..4945647 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7333,6 +7333,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.createCommandManager = exports.MinimumGitVersion = void 0; const core = __importStar(__webpack_require__(470)); @@ -7344,6 +7347,7 @@ const refHelper = __importStar(__webpack_require__(227)); const regexpHelper = __importStar(__webpack_require__(528)); const retryHelper = __importStar(__webpack_require__(587)); const git_version_1 = __webpack_require__(559); +const stream_1 = __importDefault(__webpack_require__(794)); // Auth header not supported before 2.9 // Wire protocol v2 not supported before 2.18 exports.MinimumGitVersion = new git_version_1.GitVersion('2.18'); @@ -7389,7 +7393,6 @@ class GitCommandManager { return __awaiter(this, void 0, void 0, function* () { const result = []; const stderr = []; - core.info(this.gitEnv['GIT_HTTP_USER_AGENT']); // Note, this implementation uses "rev-parse --symbolic-full-name" because the output from // "branch --list" is more difficult when in a detached HEAD state. // Note, this implementation uses "rev-parse --symbolic-full-name" because there is a bug @@ -7693,24 +7696,31 @@ class GitCommandManager { // }} const listenersD = Object.assign(Object.assign({}, customListeners), defaultListener); const stdout = []; - // let temp = '' + let temp = ''; + let temp2 = ''; const options = { cwd: this.workingDirectory, env, silent, ignoreReturnCode: allowAllExitCodes, - listeners: listenersD - // , - // errStream: new stream.Writable({ - // write(chunk, _, next) { - // temp += chunk.toString() - // next() - // } - // }) + listeners: listenersD, + errStream: new stream_1.default.Writable({ + write(chunk, _, next) { + temp += chunk.toString(); + next(); + } + }), + outStream: new stream_1.default.Writable({ + write(chunk, _, next) { + temp2 += chunk.toString(); + next(); + } + }) }; result.exitCode = yield exec.exec(`"${this.gitPath}"`, args, options); result.stdout = stdout.join(''); - core.info(result.stdout); + core.info(temp.length.toString()); + core.info(temp2.length.toString()); return result; }); } diff --git a/src/git-command-manager.ts b/src/git-command-manager.ts index 4c86e65..0fc0aed 100644 --- a/src/git-command-manager.ts +++ b/src/git-command-manager.ts @@ -94,7 +94,6 @@ class GitCommandManager { const result: string[] = [] const stderr: string[] = [] - core.info(this.gitEnv['GIT_HTTP_USER_AGENT']) // Note, this implementation uses "rev-parse --symbolic-full-name" because the output from // "branch --list" is more difficult when in a detached HEAD state. // Note, this implementation uses "rev-parse --symbolic-full-name" because there is a bug @@ -430,25 +429,33 @@ class GitCommandManager { // }} const listenersD = {...customListeners, ...defaultListener} const stdout: string[] = [] - // let temp = '' + let temp = '' + let temp2 = '' const options = { cwd: this.workingDirectory, env, silent, ignoreReturnCode: allowAllExitCodes, - listeners: listenersD - // , - // errStream: new stream.Writable({ - // write(chunk, _, next) { - // temp += chunk.toString() - // next() - // } - // }) + listeners: listenersD, + errStream: new stream.Writable({ + write(chunk, _, next) { + temp += chunk.toString() + next() + } + }), + + outStream: new stream.Writable({ + write(chunk, _, next) { + temp2 += chunk.toString() + next() + } + }) } result.exitCode = await exec.exec(`"${this.gitPath}"`, args, options) result.stdout = stdout.join('') - core.info(result.stdout) + core.info(temp.length.toString()) + core.info(temp2.length.toString()) return result }