Skip to content
Merged
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
36 changes: 26 additions & 10 deletions src/gitService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -521,16 +521,32 @@ export class GitService {

private async _exec(args: string[], cwd: string): Promise<string> {
const start = Date.now();
const cmd = this._gitPath + ' ' + args.join(' ');
return new Promise(resolve => {
exec(cmd, { encoding: 'utf8', cwd }, (err, stdout) => {
if (err) {
Tracer.error(`git command failed: ${cmd} (${Date.now() - start}ms) ${cwd} ${err.message}`);
} else {
Tracer.verbose(`git command: ${cmd}. Output size: ${stdout.length} (${Date.now() - start}ms) ${cwd}`);
resolve(stdout);
}
const cmd = this._gitPath;
try {
const result = await new Promise<string>((resolve, reject) => {
const childProcess = spawn(cmd, args, { cwd });
childProcess.stdout.setEncoding('utf8');
childProcess.stderr.setEncoding('utf8');
let stdout = '', stderr = '';
childProcess.stdout.on('data', chunk => { stdout += chunk; });
childProcess.stderr.on('data', chunk => { stderr += chunk; });
childProcess
.on('error', reject)
.on('close', code => {
if (code === 0) {
resolve(stdout);
} else {
reject(stderr);
}
});
});
});

Tracer.verbose(`git command: ${cmd}. Output size: ${result.length} (${Date.now() - start}ms) ${cwd}`);
return result;
}
catch (err) {
Tracer.error(`git command failed: ${cmd} (${Date.now() - start}ms) ${cwd} ${err}`);
throw err;
}
}
}