Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
133e9990
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,发现更多精彩内容 >>
提交
133e9990
编写于
1月 04, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
cf107f3c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
23 deletion
+21
-23
extensions/git/package.json
extensions/git/package.json
+0
-5
extensions/git/package.nls.json
extensions/git/package.nls.json
+0
-1
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+21
-17
未找到文件。
extensions/git/package.json
浏览文件 @
133e9990
...
@@ -240,11 +240,6 @@
...
@@ -240,11 +240,6 @@
"title"
:
"%command.branch%"
,
"title"
:
"%command.branch%"
,
"category"
:
"Git"
"category"
:
"Git"
},
},
{
"command"
:
"git.branchFrom"
,
"title"
:
"%command.branchFrom%"
,
"category"
:
"Git"
},
{
{
"command"
:
"git.deleteBranch"
,
"command"
:
"git.deleteBranch"
,
"title"
:
"%command.deleteBranch%"
,
"title"
:
"%command.deleteBranch%"
,
...
...
extensions/git/package.nls.json
浏览文件 @
133e9990
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
"command.undoCommit"
:
"Undo Last Commit"
,
"command.undoCommit"
:
"Undo Last Commit"
,
"command.checkout"
:
"Checkout to..."
,
"command.checkout"
:
"Checkout to..."
,
"command.branch"
:
"Create Branch..."
,
"command.branch"
:
"Create Branch..."
,
"command.branchFrom"
:
"Create Branch From..."
,
"command.deleteBranch"
:
"Delete Branch..."
,
"command.deleteBranch"
:
"Delete Branch..."
,
"command.renameBranch"
:
"Rename Branch..."
,
"command.renameBranch"
:
"Rename Branch..."
,
"command.merge"
:
"Merge Branch..."
,
"command.merge"
:
"Merge Branch..."
,
...
...
extensions/git/src/commands.ts
浏览文件 @
133e9990
...
@@ -103,6 +103,15 @@ class CreateBranchItem implements QuickPickItem {
...
@@ -103,6 +103,15 @@ class CreateBranchItem implements QuickPickItem {
}
}
}
}
class
HEADItem
implements
QuickPickItem
{
constructor
(
private
repository
:
Repository
)
{
}
get
label
():
string
{
return
'
HEAD
'
;
}
get
description
():
string
{
return
(
this
.
repository
.
HEAD
&&
this
.
repository
.
HEAD
.
commit
||
''
).
substr
(
0
,
8
);
}
get
alwaysShow
():
boolean
{
return
true
;
}
}
interface
CommandOptions
{
interface
CommandOptions
{
repository
?:
boolean
;
repository
?:
boolean
;
diff
?:
boolean
;
diff
?:
boolean
;
...
@@ -154,7 +163,7 @@ async function categorizeResourceByResolution(resources: Resource[]): Promise<{
...
@@ -154,7 +163,7 @@ async function categorizeResourceByResolution(resources: Resource[]): Promise<{
return
{
merge
,
resolved
,
unresolved
,
deletionConflicts
};
return
{
merge
,
resolved
,
unresolved
,
deletionConflicts
};
}
}
function
repositoryRefsToItems
(
repository
:
Repository
):
Array
<
CheckoutItem
>
{
function
createCheckoutItems
(
repository
:
Repository
):
CheckoutItem
[]
{
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
checkoutType
=
config
.
get
<
string
>
(
'
checkoutType
'
)
||
'
all
'
;
const
checkoutType
=
config
.
get
<
string
>
(
'
checkoutType
'
)
||
'
all
'
;
const
includeTags
=
checkoutType
===
'
all
'
||
checkoutType
===
'
tags
'
;
const
includeTags
=
checkoutType
===
'
all
'
||
checkoutType
===
'
tags
'
;
...
@@ -170,7 +179,7 @@ function repositoryRefsToItems(repository: Repository): Array<CheckoutItem> {
...
@@ -170,7 +179,7 @@ function repositoryRefsToItems(repository: Repository): Array<CheckoutItem> {
return
[...
heads
,
...
tags
,
...
remoteHeads
];
return
[...
heads
,
...
tags
,
...
remoteHeads
];
}
}
async
function
inputNameForBranch
():
Promise
<
string
>
{
async
function
getBranchNameFromUser
():
Promise
<
string
>
{
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
branchWhitespaceChar
=
config
.
get
<
string
>
(
'
branchWhitespaceChar
'
)
!
;
const
branchWhitespaceChar
=
config
.
get
<
string
>
(
'
branchWhitespaceChar
'
)
!
;
const
branchValidationRegex
=
config
.
get
<
string
>
(
'
branchValidationRegex
'
)
!
;
const
branchValidationRegex
=
config
.
get
<
string
>
(
'
branchValidationRegex
'
)
!
;
...
@@ -1437,7 +1446,7 @@ export class CommandCenter {
...
@@ -1437,7 +1446,7 @@ export class CommandCenter {
}
}
const
createBranch
=
new
CreateBranchItem
(
this
);
const
createBranch
=
new
CreateBranchItem
(
this
);
const
picks
=
[
createBranch
,
...
repositoryRefsTo
Items
(
repository
)];
const
picks
=
[
createBranch
,
...
createCheckout
Items
(
repository
)];
const
placeHolder
=
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
);
const
placeHolder
=
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
);
const
choice
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
const
choice
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
...
@@ -1450,27 +1459,22 @@ export class CommandCenter {
...
@@ -1450,27 +1459,22 @@ export class CommandCenter {
}
}
@
command
(
'
git.branch
'
,
{
repository
:
true
})
@
command
(
'
git.branch
'
,
{
repository
:
true
})
async
branch
(
repository
:
Repository
,
ref
?:
string
):
Promise
<
void
>
{
async
branch
(
repository
:
Repository
):
Promise
<
void
>
{
const
name
=
await
inputNameForBranch
();
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
;
return
;
}
}
await
repository
.
branch
(
name
,
true
,
ref
);
const
name
=
await
getBranchNameFromUser
();
}
@
command
(
'
git.branchFrom
'
,
{
repository
:
true
})
async
createBranchFrom
(
repository
:
Repository
):
Promise
<
void
>
{
const
refs
=
repositoryRefsToItems
(
repository
);
const
placeHolder
=
localize
(
'
select a ref to create a new branch from
'
,
'
Select a ref to create a new branch from
'
);
const
choice
=
await
window
.
showQuickPick
(
refs
,
{
placeHolder
});
if
(
!
choic
e
)
{
if
(
!
nam
e
)
{
return
;
return
;
}
}
await
this
.
branch
(
repository
,
choice
.
label
);
await
repository
.
branch
(
name
,
true
,
target
.
label
);
}
}
@
command
(
'
git.deleteBranch
'
,
{
repository
:
true
})
@
command
(
'
git.deleteBranch
'
,
{
repository
:
true
})
...
@@ -2010,7 +2014,7 @@ export class CommandCenter {
...
@@ -2010,7 +2014,7 @@ export class CommandCenter {
return
Promise
.
resolve
();
return
Promise
.
resolve
();
}
}
return
Promise
.
resolve
(
method
.
apply
(
this
,
[
repository
,
...
args
.
slice
(
1
)
]));
return
Promise
.
resolve
(
method
.
apply
(
this
,
[
repository
,
...
args
]));
});
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录