Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3a8c5531
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,发现更多精彩内容 >>
提交
3a8c5531
编写于
10月 21, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
7d89faae
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
4 addition
and
18 deletion
+4
-18
src/vs/workbench/parts/git/browser/gitQuickOpen.ts
src/vs/workbench/parts/git/browser/gitQuickOpen.ts
+4
-9
src/vs/workbench/parts/git/common/git.ts
src/vs/workbench/parts/git/common/git.ts
+0
-9
未找到文件。
src/vs/workbench/parts/git/browser/gitQuickOpen.ts
浏览文件 @
3a8c5531
...
...
@@ -8,7 +8,7 @@ import { localize } from 'vs/nls';
import
{
matchesContiguousSubString
}
from
'
vs/base/common/filters
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
IGitService
,
RefType
,
IRef
,
isValidBranchName
,
correctBranchName
}
from
'
vs/workbench/parts/git/common/git
'
;
import
{
IGitService
,
RefType
,
IRef
}
from
'
vs/workbench/parts/git/common/git
'
;
import
{
ICommand
,
CommandQuickOpenHandler
}
from
'
vs/workbench/browser/quickopen
'
;
import
{
Mode
}
from
'
vs/base/parts/quickopen/common/quickOpen
'
;
import
{
QuickOpenEntry
,
IHighlight
,
IContext
,
QuickOpenEntryGroup
}
from
'
vs/base/parts/quickopen/browser/quickOpenModel
'
;
...
...
@@ -103,7 +103,9 @@ class BranchEntry extends QuickOpenEntry {
this
.
gitService
=
gitService
;
this
.
messageService
=
messageService
;
this
.
name
=
name
;
// sanitize name
this
.
name
=
name
.
replace
(
/^
\.
|
\/\.
|
\.\.
|~|
\^
|:|
\/
$|
\.
lock$|
\.
lock
\/
|
\\
|
\*
|
\s
|^
\s
*$|
\.
$/g
,
'
-
'
);
}
getIcon
():
string
{
return
'
git
'
;
}
...
...
@@ -191,9 +193,6 @@ class CheckoutCommand implements ICommand {
entries
.
unshift
(
new
CurrentHeadEntry
(
this
.
gitService
,
this
.
messageService
,
currentHeadMatches
[
0
].
head
,
currentHeadMatches
[
0
].
highlights
));
}
else
if
(
exactMatches
.
length
===
0
&&
input
)
{
if
(
!
isValidBranchName
(
input
))
{
input
=
correctBranchName
(
input
);
}
const
branchEntry
=
new
BranchEntry
(
this
.
gitService
,
this
.
messageService
,
input
);
entries
.
push
(
new
QuickOpenEntryGroup
(
branchEntry
,
'
branch
'
,
checkoutEntries
.
length
>
0
||
remoteHeadEntries
.
length
>
0
));
}
...
...
@@ -222,10 +221,6 @@ class BranchCommand implements ICommand {
return
TPromise
.
as
([]);
}
if
(
!
isValidBranchName
(
input
))
{
input
=
correctBranchName
(
input
);
}
const
gitModel
=
this
.
gitService
.
getModel
();
const
currentHead
=
gitModel
.
getHEAD
();
...
...
src/vs/workbench/parts/git/common/git.ts
浏览文件 @
3a8c5531
...
...
@@ -337,12 +337,3 @@ export interface IGitService extends IEventEmitter {
export
interface
IAskpassService
{
askpass
(
id
:
string
,
host
:
string
,
command
:
string
):
TPromise
<
ICredentials
>
;
}
\ No newline at end of file
// Utils
const
invalidBranchPatternName
=
/^
\.
|
\/\.
|
\.\.
|~|
\^
|:|
\/
$|
\.
lock$|
\.
lock
\/
|
\\
|
\*
|
\s
|^
\s
*$|
\.
$/g
;
export
function
isValidBranchName
(
value
:
string
):
boolean
{
return
!
invalidBranchPatternName
.
test
(
value
);
}
export
function
correctBranchName
(
branchName
:
string
):
string
{
return
branchName
.
replace
(
invalidBranchPatternName
,
'
-
'
);
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录