Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f37b9d74
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
f37b9d74
编写于
11月 20, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
git: isolate ipc env
上级
af864aed
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
12 deletion
+22
-12
extensions/git/src/askpass-main.ts
extensions/git/src/askpass-main.ts
+1
-6
extensions/git/src/askpass.ts
extensions/git/src/askpass.ts
+2
-3
extensions/git/src/ipc/ipcClient.ts
extensions/git/src/ipc/ipcClient.ts
+11
-1
extensions/git/src/ipc/ipcServer.ts
extensions/git/src/ipc/ipcServer.ts
+5
-0
extensions/git/src/main.ts
extensions/git/src/main.ts
+3
-2
未找到文件。
extensions/git/src/askpass-main.ts
浏览文件 @
f37b9d74
...
...
@@ -20,10 +20,6 @@ function main(argv: string[]): void {
return
fatal
(
'
Wrong number of arguments
'
);
}
if
(
!
process
.
env
[
'
VSCODE_GIT_ASKPASS_HANDLE
'
])
{
return
fatal
(
'
Missing handle
'
);
}
if
(
!
process
.
env
[
'
VSCODE_GIT_ASKPASS_PIPE
'
])
{
return
fatal
(
'
Missing pipe
'
);
}
...
...
@@ -33,10 +29,9 @@ function main(argv: string[]): void {
}
const
output
=
process
.
env
[
'
VSCODE_GIT_ASKPASS_PIPE
'
]
as
string
;
const
socketPath
=
process
.
env
[
'
VSCODE_GIT_ASKPASS_HANDLE
'
]
as
string
;
const
request
=
argv
[
2
];
const
host
=
argv
[
4
].
substring
(
1
,
argv
[
4
].
length
-
2
);
const
ipcClient
=
new
IPCClient
(
'
askpass
'
,
socketPath
);
const
ipcClient
=
new
IPCClient
(
'
askpass
'
);
ipcClient
.
call
({
request
,
host
}).
then
(
res
=>
{
fs
.
writeFileSync
(
output
,
res
+
'
\n
'
);
...
...
extensions/git/src/askpass.ts
浏览文件 @
f37b9d74
...
...
@@ -26,7 +26,7 @@ export class Askpass implements IIPCHandler {
};
}
constructor
(
private
ipc
:
IIPCServer
)
{
constructor
(
ipc
:
IIPCServer
)
{
this
.
disposable
=
ipc
.
registerHandler
(
'
askpass
'
,
this
);
}
...
...
@@ -46,8 +46,7 @@ export class Askpass implements IIPCHandler {
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_HANDLE
:
this
.
ipc
.
ipcHandlePath
VSCODE_GIT_ASKPASS_MAIN
:
path
.
join
(
__dirname
,
'
askpass-main.js
'
)
};
}
...
...
extensions/git/src/ipc/ipcClient.ts
浏览文件 @
f37b9d74
...
...
@@ -7,7 +7,17 @@ import * as http from 'http';
export
class
IPCClient
{
constructor
(
private
handlerName
:
string
,
private
ipcHandlePath
:
string
)
{
}
private
ipcHandlePath
:
string
;
constructor
(
private
handlerName
:
string
)
{
const
ipcHandlePath
=
process
.
env
[
'
VSCODE_GIT_IPC_HANDLE
'
];
if
(
!
ipcHandlePath
)
{
throw
new
Error
(
'
Missing VSCODE_GIT_IPC_HANDLE
'
);
}
this
.
ipcHandlePath
=
ipcHandlePath
;
}
call
(
request
:
any
):
Promise
<
any
>
{
const
opts
:
http
.
RequestOptions
=
{
...
...
extensions/git/src/ipc/ipcServer.ts
浏览文件 @
f37b9d74
...
...
@@ -48,6 +48,7 @@ export async function createIPCServer(): Promise<IIPCServer> {
export
interface
IIPCServer
extends
Disposable
{
readonly
ipcHandlePath
:
string
|
undefined
;
getEnv
():
any
;
registerHandler
(
name
:
string
,
handler
:
IIPCHandler
):
Disposable
;
}
...
...
@@ -92,6 +93,10 @@ class IPCServer implements IIPCServer, Disposable {
});
}
getEnv
():
any
{
return
{
VSCODE_GIT_IPC_HANDLE
:
this
.
ipcHandlePath
};
}
dispose
():
void
{
this
.
handlers
.
clear
();
this
.
server
.
close
();
...
...
extensions/git/src/main.ts
浏览文件 @
f37b9d74
...
...
@@ -34,15 +34,16 @@ export async function deactivate(): Promise<any> {
async
function
createModel
(
context
:
ExtensionContext
,
outputChannel
:
OutputChannel
,
telemetryReporter
:
TelemetryReporter
,
disposables
:
Disposable
[]):
Promise
<
Model
>
{
const
pathHint
=
workspace
.
getConfiguration
(
'
git
'
).
get
<
string
>
(
'
path
'
);
const
info
=
await
findGit
(
pathHint
,
path
=>
outputChannel
.
appendLine
(
localize
(
'
looking
'
,
"
Looking for git in: {0}
"
,
path
)));
let
env
:
any
=
undefined
;
let
env
:
any
=
{}
;
try
{
const
ipc
=
await
createIPCServer
();
disposables
.
push
(
ipc
);
env
=
{
...
env
,
...
ipc
.
getEnv
()
};
const
askpass
=
new
Askpass
(
ipc
);
disposables
.
push
(
askpass
);
env
=
askpass
.
getEnv
()
;
env
=
{
...
env
,
...
askpass
.
getEnv
()
}
;
}
catch
{
env
=
Askpass
.
getDisabledEnv
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录