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

🐛 fixes #24598

Browse Source
This commit is contained in:
Joao Moreno
2017-04-21 09:19:53 +02:00
parent 6c5926309d
commit b1d403f866
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/git/src/askpass.ts
View File

@@ -13,16 +13,18 @@ export class Askpass implements Disposable {
private server: http.Server;
private portPromise: Promise<number>;
private enabled = true;
constructor() {
this.server = http.createServer((req, res) => this.onRequest(req, res));
this.server.listen(0, 'localhost');
this.portPromise = new Promise(c => {
this.server.on('listening', () => c(this.server.address().port));
});
this.server.on('error', err => console.error(err));
try {
this.server.listen(0);
this.portPromise = new Promise(c => this.server.on('listening', () => c(this.server.address().port)));
this.server.on('error', err => console.error(err));
} catch (err) {
this.enabled = false;
}
}
private onRequest(req: http.ServerRequest, res: http.ServerResponse): void {
@@ -53,14 +55,20 @@ export class Askpass implements Disposable {
return await window.showInputBox(options) || '';
}
getEnv(): Promise<any> {
return this.portPromise.then(port => ({
async getEnv(): Promise<any> {
if (!this.enabled) {
return {
GIT_ASKPASS: path.join(__dirname, 'askpass-empty.sh')
};
}
return {
ELECTRON_RUN_AS_NODE: '1',
GIT_ASKPASS: path.join(__dirname, 'askpass.sh'),
VSCODE_GIT_ASKPASS_NODE: process.execPath,
VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js'),
VSCODE_GIT_ASKPASS_PORT: String(port)
}));
VSCODE_GIT_ASKPASS_PORT: String(await this.portPromise)
};
}
dispose(): void {