Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 06:51:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

🎨 cleanup git show code

Browse Source
This commit is contained in:
Joao Moreno
2017-04-24 10:51:08 +02:00
parent 3598679114
commit 566fdd4879
3 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/git/src/git.ts
View File

@@ -158,7 +158,7 @@ export interface IExecutionResult {
stderr: string;
}
export async function exec(child: cp.ChildProcess, encoding: string = 'utf8'): Promise<IExecutionResult> {
async function exec(child: cp.ChildProcess, options: any = {}): Promise<IExecutionResult> {
const disposables: IDisposable[] = [];
const once = (ee: NodeJS.EventEmitter, name: string, fn: Function) => {
@@ -179,7 +179,7 @@ export async function exec(child: cp.ChildProcess, encoding: string = 'utf8'): P
new Promise<string>(c => {
const buffers: Buffer[] = [];
on(child.stdout, 'data', b => buffers.push(b));
once(child.stdout, 'close', () => c(iconv.decode(Buffer.concat(buffers), encoding)));
once(child.stdout, 'close', () => c(iconv.decode(Buffer.concat(buffers), options.encoding || 'utf8')));
}),
new Promise<string>(c => {
const buffers: Buffer[] = [];
@@ -328,7 +328,7 @@ export class Git {
child.stdin.end(options.input, 'utf8');
}
const result = await exec(child, options.encoding);
const result = await exec(child, options);
if (result.exitCode) {
let gitErrorCode: string | undefined = void 0;
@@ -513,14 +513,23 @@ export class Repository {
return result.stdout;
}
async buffer(object: string): Promise<string> {
async buffer(object: string, encoding: string = 'utf8'): Promise<string> {
const child = this.stream(['show', object]);
if (!child.stdout) {
return Promise.reject<string>('Can\'t open file from git');
}
return await this.doBuffer(object);
const { exitCode, stdout } = await exec(child, { encoding });
if (exitCode) {
return Promise.reject<string>(new GitError({
message: 'Could not show object.',
exitCode
}));
}
return stdout;
// TODO@joao
// return new Promise((c, e) => {
@@ -539,20 +548,6 @@ export class Repository {
// });
}
private async doBuffer(object: string): Promise<string> {
const child = this.stream(['show', object]);
const { exitCode, stdout } = await exec(child);
if (exitCode) {
return Promise.reject<string>(new GitError({
message: 'Could not buffer object.',
exitCode
}));
}
return stdout;
}
async add(paths: string[]): Promise<void> {
const args = ['add', '-A', '--'];