Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup gitApp

Browse Source
This commit is contained in:
Joao Moreno
2015-11-26 14:41:50 +01:00
parent 9ea057a6cc
commit 0f5afc9ee5
1 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/vs/workbench/parts/git/electron-browser/gitApp.ts
View File

@@ -10,54 +10,37 @@ import uri from 'vs/base/common/uri';
import gitlib = require('vs/workbench/parts/git/node/git.lib');
import rawgitservice = require('vs/workbench/parts/git/node/rawGitService');
import path = require('path');
import fs = require('fs');
import { join, dirname, normalize } from 'path';
import { tmpdir } from 'os';
import { writeFileSync } from 'fs';
class NativeRawGitService extends rawgitservice.RawGitService {
class IPCRawGitService extends rawgitservice.RawGitService {
constructor(gitPath: string, basePath: string, defaultEncoding: string, exePath: string) {
if (!gitPath) {
super(null);
return;
}
} else {
const gitRootPath = uri.parse(require.toUrl('vs/workbench/parts/git/electron-main')).fsPath;
const bootstrapPath = `${ uri.parse(require.toUrl('bootstrap')).fsPath }.js`;
var gitRootPath = uri.parse(require.toUrl('vs/workbench/parts/git/electron-main')).fsPath;
const env = objects.assign({}, process.env, {
GIT_ASKPASS: join(gitRootPath, 'askpass.sh'),
VSCODE_GIT_ASKPASS_BOOTSTRAP: bootstrapPath,
VSCODE_GIT_ASKPASS_NODE: exePath,
VSCODE_GIT_ASKPASS_MODULE_ID: 'vs/workbench/parts/git/electron-main/askpass'
});
var env = objects.assign(objects.assign({}, process.env), {
GIT_ASKPASS: path.join(gitRootPath, 'askpass.sh'),
VSCODE_GIT_ASKPASS_BOOTSTRAP: path.join(path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(gitRootPath))))), 'bootstrap.js'),
VSCODE_GIT_ASKPASS_NODE: exePath,
VSCODE_GIT_ASKPASS_MODULE_ID: 'vs/workbench/parts/git/electron-main/askpass'
});
const git = new gitlib.Git({
gitPath: gitPath,
tmpPath: tmpdir(),
defaultEncoding: defaultEncoding,
env: env
});
var git = new gitlib.Git({
gitPath: gitPath,
tmpPath: tmpdirSync(), // TODO@Joao os.tmpdir()???
defaultEncoding: defaultEncoding,
env: env
});
super(git.open(path.normalize(basePath)));
}
}
function tmpdirSync(): string {
var path: string;
var paths = /^win/i.test(process.platform) ? [process.env.TMP, process.env.TEMP] : ['/tmp', '/var/tmp', '/private/tmp', '/private/var/tmp'];
for (var i = 0; i < paths.length; i++) {
path = paths[i];
try {
if (fs.statSync(path).isDirectory()) {
return path;
}
} catch (e) {
// Ignore
super(git.open(normalize(basePath)));
}
}
throw new Error('Temp dir not found');
}
const server = new Server();
server.registerService('GitService', new NativeRawGitService(process.argv[2], process.argv[3], process.argv[4], process.argv[5]));
server.registerService('GitService', new IPCRawGitService(process.argv[2], process.argv[3], process.argv[4], process.argv[5]));