Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8dcb0d6e
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,发现更多精彩内容 >>
提交
8dcb0d6e
编写于
3月 13, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🐛
improve git commit error reporting
fixes #21251
上级
cb7e5a27
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
9 deletion
+19
-9
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+19
-9
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
8dcb0d6e
...
@@ -59,7 +59,7 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
...
@@ -59,7 +59,7 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
}
}
}
}
const
Commands
:
{
commandId
:
string
;
method
:
Function
;
}[]
=
[];
const
Commands
:
{
commandId
:
string
;
key
:
string
;
method
:
Function
;
}[]
=
[];
function
command
(
commandId
:
string
):
Function
{
function
command
(
commandId
:
string
):
Function
{
return
(
target
:
any
,
key
:
string
,
descriptor
:
any
)
=>
{
return
(
target
:
any
,
key
:
string
,
descriptor
:
any
)
=>
{
...
@@ -67,7 +67,7 @@ function command(commandId: string): Function {
...
@@ -67,7 +67,7 @@ function command(commandId: string): Function {
throw
new
Error
(
'
not supported
'
);
throw
new
Error
(
'
not supported
'
);
}
}
Commands
.
push
({
commandId
,
method
:
descriptor
.
value
});
Commands
.
push
({
commandId
,
key
,
method
:
descriptor
.
value
});
};
};
}
}
...
@@ -86,7 +86,7 @@ export class CommandCenter {
...
@@ -86,7 +86,7 @@ export class CommandCenter {
}
}
this
.
disposables
=
Commands
this
.
disposables
=
Commands
.
map
(({
commandId
,
method
})
=>
commands
.
registerCommand
(
commandId
,
this
.
createCommand
(
commandId
,
method
)));
.
map
(({
commandId
,
key
,
method
})
=>
commands
.
registerCommand
(
commandId
,
this
.
createCommand
(
commandId
,
key
,
method
)));
}
}
@
command
(
'
git.refresh
'
)
@
command
(
'
git.refresh
'
)
...
@@ -710,8 +710,8 @@ export class CommandCenter {
...
@@ -710,8 +710,8 @@ export class CommandCenter {
this
.
outputChannel
.
show
();
this
.
outputChannel
.
show
();
}
}
private
createCommand
(
id
:
string
,
method
:
Function
):
(...
args
:
any
[])
=>
any
{
private
createCommand
(
id
:
string
,
key
:
string
,
method
:
Function
):
(...
args
:
any
[])
=>
any
{
return
(...
args
)
=>
{
const
result
=
(...
args
)
=>
{
if
(
!
this
.
model
)
{
if
(
!
this
.
model
)
{
window
.
showInformationMessage
(
localize
(
'
disabled
'
,
"
Git is either disabled or not supported in this workspace
"
));
window
.
showInformationMessage
(
localize
(
'
disabled
'
,
"
Git is either disabled or not supported in this workspace
"
));
return
;
return
;
...
@@ -729,12 +729,17 @@ export class CommandCenter {
...
@@ -729,12 +729,17 @@ export class CommandCenter {
message
=
localize
(
'
clean repo
'
,
"
Please clean your repository working tree before checkout.
"
);
message
=
localize
(
'
clean repo
'
,
"
Please clean your repository working tree before checkout.
"
);
break
;
break
;
default
:
default
:
const
lines
=
(
err
.
stderr
||
err
.
message
||
String
(
err
))
const
hint
=
(
err
.
stderr
||
err
.
message
||
String
(
err
))
.
replace
(
/^error: /
,
''
)
.
replace
(
/^error: /mi
,
''
)
.
replace
(
/^> husky.*$/mi
,
''
)
.
split
(
/
[\r\n]
/
)
.
split
(
/
[\r\n]
/
)
.
filter
(
line
=>
!!
line
);
.
filter
(
line
=>
!!
line
)
[
0
];
message
=
hint
?
localize
(
'
git error details
'
,
"
Git: {0}
"
,
hint
)
:
localize
(
'
git error
'
,
"
Git error
"
);
message
=
lines
[
0
]
||
'
Git error
'
;
break
;
break
;
}
}
...
@@ -752,6 +757,11 @@ export class CommandCenter {
...
@@ -752,6 +757,11 @@ export class CommandCenter {
}
}
});
});
};
};
// patch this object, so people can call methods directly
this
[
key
]
=
result
;
return
result
;
}
}
private
resolveSCMResource
(
uri
?:
Uri
):
Resource
|
undefined
{
private
resolveSCMResource
(
uri
?:
Uri
):
Resource
|
undefined
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录