Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
dcb3c339
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dcb3c339
编写于
1月 04, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
preserve user input when creating branch from checkout
fixes #60895
上级
133e9990
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
47 addition
and
34 deletion
+47
-34
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+47
-34
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
dcb3c339
...
...
@@ -179,31 +179,6 @@ function createCheckoutItems(repository: Repository): CheckoutItem[] {
return
[...
heads
,
...
tags
,
...
remoteHeads
];
}
async
function
getBranchNameFromUser
():
Promise
<
string
>
{
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
branchWhitespaceChar
=
config
.
get
<
string
>
(
'
branchWhitespaceChar
'
)
!
;
const
branchValidationRegex
=
config
.
get
<
string
>
(
'
branchValidationRegex
'
)
!
;
const
sanitize
=
(
name
:
string
)
=>
name
?
name
.
trim
().
replace
(
/^
\.
|
\/\.
|
\.\.
|~|
\^
|:|
\/
$|
\.
lock$|
\.
lock
\/
|
\\
|
\*
|
\s
|^
\s
*$|
\.
$|
\[
|
\]
$/g
,
branchWhitespaceChar
)
:
name
;
const
result
=
await
window
.
showInputBox
({
placeHolder
:
localize
(
'
branch name
'
,
"
Branch name
"
),
prompt
:
localize
(
'
provide branch name
'
,
"
Please provide a branch name
"
),
ignoreFocusOut
:
true
,
validateInput
:
(
name
:
string
)
=>
{
const
validateName
=
new
RegExp
(
branchValidationRegex
);
if
(
validateName
.
test
(
sanitize
(
name
)))
{
return
null
;
}
return
localize
(
'
branch name format invalid
'
,
"
Branch name needs to match regex: {0}
"
,
branchValidationRegex
);
}
});
return
sanitize
(
result
||
''
);
}
enum
PushType
{
Push
,
PushTo
,
...
...
@@ -1448,33 +1423,71 @@ export class CommandCenter {
const
picks
=
[
createBranch
,
...
createCheckoutItems
(
repository
)];
const
placeHolder
=
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
);
const
choice
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
const
quickpick
=
window
.
createQuickPick
();
quickpick
.
items
=
picks
;
quickpick
.
placeholder
=
placeHolder
;
quickpick
.
show
();
const
choice
=
await
new
Promise
<
QuickPickItem
|
undefined
>
(
c
=>
quickpick
.
onDidAccept
(()
=>
c
(
quickpick
.
activeItems
[
0
])));
quickpick
.
hide
();
if
(
!
choice
)
{
return
false
;
}
await
choice
.
run
(
repository
);
if
(
choice
===
createBranch
)
{
await
this
.
_branch
(
repository
,
quickpick
.
value
);
}
else
{
await
(
choice
as
CheckoutItem
).
run
(
repository
);
}
return
true
;
}
@
command
(
'
git.branch
'
,
{
repository
:
true
})
async
branch
(
repository
:
Repository
):
Promise
<
void
>
{
const
picks
=
[
new
HEADItem
(
repository
),
...
createCheckoutItems
(
repository
)];
const
placeHolder
=
localize
(
'
select a ref to create a new branch from
'
,
'
Select a ref to create a new branch from
'
);
const
target
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
await
this
.
_branch
(
repository
);
}
if
(
!
target
)
{
private
async
_branch
(
repository
:
Repository
,
defaultName
?:
string
):
Promise
<
void
>
{
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
branchWhitespaceChar
=
config
.
get
<
string
>
(
'
branchWhitespaceChar
'
)
!
;
const
branchValidationRegex
=
config
.
get
<
string
>
(
'
branchValidationRegex
'
)
!
;
const
sanitize
=
(
name
:
string
)
=>
name
?
name
.
trim
().
replace
(
/^
\.
|
\/\.
|
\.\.
|~|
\^
|:|
\/
$|
\.
lock$|
\.
lock
\/
|
\\
|
\*
|
\s
|^
\s
*$|
\.
$|
\[
|
\]
$/g
,
branchWhitespaceChar
)
:
name
;
const
rawBranchName
=
await
window
.
showInputBox
({
value
:
defaultName
,
placeHolder
:
localize
(
'
branch name
'
,
"
Branch name
"
),
prompt
:
localize
(
'
provide branch name
'
,
"
Please provide a branch name
"
),
ignoreFocusOut
:
true
,
validateInput
:
(
name
:
string
)
=>
{
const
validateName
=
new
RegExp
(
branchValidationRegex
);
if
(
validateName
.
test
(
sanitize
(
name
)))
{
return
null
;
}
return
localize
(
'
branch name format invalid
'
,
"
Branch name needs to match regex: {0}
"
,
branchValidationRegex
);
}
});
const
branchName
=
sanitize
(
rawBranchName
||
''
);
if
(
!
branchName
)
{
return
;
}
const
name
=
await
getBranchNameFromUser
();
const
picks
=
[
new
HEADItem
(
repository
),
...
createCheckoutItems
(
repository
)];
const
placeHolder
=
localize
(
'
select a ref to create a new branch from
'
,
'
Select a ref to create a new branch from
'
);
const
target
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
if
(
!
name
)
{
if
(
!
target
)
{
return
;
}
await
repository
.
branch
(
n
ame
,
true
,
target
.
label
);
await
repository
.
branch
(
branchN
ame
,
true
,
target
.
label
);
}
@
command
(
'
git.deleteBranch
'
,
{
repository
:
true
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录