Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c0021de2
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,发现更多精彩内容 >>
提交
c0021de2
编写于
9月 13, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
a6985d76
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
27 deletion
+26
-27
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+17
-12
extensions/git/src/git.ts
extensions/git/src/git.ts
+9
-15
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
c0021de2
...
...
@@ -1848,6 +1848,11 @@ export class CommandCenter {
let
message
:
string
;
let
type
:
'
error
'
|
'
warning
'
=
'
error
'
;
const
choices
=
new
Map
<
string
,
()
=>
void
>
();
const
openOutputChannelChoice
=
localize
(
'
open git log
'
,
"
Open Git Log
"
);
const
outputChannel
=
this
.
outputChannel
as
OutputChannel
;
choices
.
set
(
openOutputChannelChoice
,
()
=>
outputChannel
.
show
());
switch
(
err
.
gitErrorCode
)
{
case
GitErrorCodes
.
DirtyWorkTree
:
message
=
localize
(
'
clean repo
'
,
"
Please clean your repository working tree before checkout.
"
);
...
...
@@ -1862,11 +1867,8 @@ export class CommandCenter {
break
;
case
GitErrorCodes
.
NoUserNameConfigured
:
case
GitErrorCodes
.
NoUserEmailConfigured
:
message
=
localize
(
'
missing user info
'
,
"
Make sure that user.email and user.name are configured correctly.
\n\n
{0}
\n
{1}
\n\n
{2}
\n
{3}
"
,
"
current user.email:
"
+
err
.
userEmail
||
""
,
"
current user.name:
"
+
err
.
userName
||
""
,
"
git config --global user.email
\"
you@example.com
\"
"
,
"
git config --global user.name
\"
Your Name
\"
"
);
message
=
localize
(
'
missing user info
'
,
"
Make sure you configure your 'user.name' and 'user.email' in git.
"
);
choices
.
set
(
localize
(
'
learn more
'
,
"
Learn More
"
),
()
=>
commands
.
executeCommand
(
'
vscode.open
'
,
Uri
.
parse
(
'
https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup
'
)));
break
;
default
:
const
hint
=
(
err
.
stderr
||
err
.
message
||
String
(
err
))
...
...
@@ -1888,14 +1890,17 @@ export class CommandCenter {
return
;
}
const
outputChannel
=
this
.
outputChannel
as
OutputChannel
;
const
openOutputChannelChoice
=
localize
(
'
open git log
'
,
"
Open Git Log
"
);
const
choice
=
type
===
'
error
'
?
await
window
.
showErrorMessage
(
message
,
options
,
openOutputChannelChoice
)
:
await
window
.
showWarningMessage
(
message
,
options
,
openOutputChannelChoice
);
const
allChoices
=
Array
.
from
(
choices
.
keys
());
const
result
=
type
===
'
error
'
?
await
window
.
showErrorMessage
(
message
,
options
,
...
allChoices
)
:
await
window
.
showWarningMessage
(
message
,
options
,
...
allChoices
);
if
(
result
)
{
const
resultFn
=
choices
.
get
(
result
);
if
(
choice
===
openOutputChannelChoice
)
{
outputChannel
.
show
();
if
(
resultFn
)
{
resultFn
();
}
}
});
};
...
...
extensions/git/src/git.ts
浏览文件 @
c0021de2
...
...
@@ -998,26 +998,20 @@ export class Repository {
throw
commitErr
;
}
let
userName
,
userEmail
;
try
{
const
nameResult
=
await
this
.
run
([
'
config
'
,
'
--get-all
'
,
'
user.name
'
]);
userName
=
nameResult
.
stdout
.
split
(
'
\n
'
).
filter
(
l
=>
!!
l
).
pop
();
}
catch
(
err
)
{
}
await
this
.
run
([
'
config
'
,
'
--get-all
'
,
'
user.name
'
]);
}
catch
(
err
)
{
err
.
gitErrorCode
=
GitErrorCodes
.
NoUserNameConfigured
;
throw
err
;
}
try
{
const
emailResult
=
await
this
.
run
([
'
config
'
,
'
--get-all
'
,
'
user.email
'
]);
userEmail
=
emailResult
.
stdout
.
split
(
'
\n
'
).
filter
(
l
=>
!!
l
).
pop
();
}
catch
(
err
)
{
}
if
(
userName
&&
userEmail
)
{
throw
commitErr
;
await
this
.
run
([
'
config
'
,
'
--get-all
'
,
'
user.email
'
]);
}
catch
(
err
)
{
err
.
gitErrorCode
=
GitErrorCodes
.
NoUserEmailConfigured
;
throw
err
;
}
commitErr
.
gitErrorCode
=
!
userName
?
GitErrorCodes
.
NoUserNameConfigured
:
GitErrorCodes
.
NoUserEmailConfigured
;
commitErr
.
userName
=
userName
;
commitErr
.
userEmail
=
userEmail
;
throw
commitErr
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录