Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
89cd05f8
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,发现更多精彩内容 >>
提交
89cd05f8
编写于
5月 05, 2017
作者:
R
Rokas Gečas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#10542 MergeItem class created, localized strings
上级
818fa5a5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
14 deletion
+16
-14
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+16
-14
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
89cd05f8
...
...
@@ -17,21 +17,15 @@ import * as nls from 'vscode-nls';
const
localize
=
nls
.
loadMessageBundle
();
class
CheckoutBasicItem
implements
QuickPickItem
{
get
label
():
string
{
return
this
.
ref
.
name
||
''
;
}
get
description
():
string
{
return
this
.
ref
.
name
||
''
;
}
constructor
(
protected
ref
:
Ref
)
{
}
}
class
CheckoutItem
extends
CheckoutBasicItem
{
class
CheckoutItem
implements
QuickPickItem
{
protected
get
shortCommit
():
string
{
return
(
this
.
ref
.
commit
||
''
).
substr
(
0
,
8
);
}
protected
get
treeish
():
string
|
undefined
{
return
this
.
ref
.
name
;
}
get
label
():
string
{
return
this
.
ref
.
name
||
this
.
shortCommit
;
}
get
description
():
string
{
return
this
.
shortCommit
;
}
constructor
(
protected
ref
:
Ref
)
{
}
async
run
(
model
:
Model
):
Promise
<
void
>
{
const
ref
=
this
.
treeish
;
...
...
@@ -66,6 +60,14 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
}
}
class
MergeItem
implements
QuickPickItem
{
get
label
():
string
{
return
this
.
ref
.
name
||
''
;
}
get
description
():
string
{
return
this
.
ref
.
name
||
''
;
}
constructor
(
protected
ref
:
Ref
)
{
}
}
interface
Command
{
commandId
:
string
;
key
:
string
;
...
...
@@ -651,7 +653,7 @@ export class CommandCenter {
.
map
(
ref
=>
new
CheckoutRemoteHeadItem
(
ref
));
const
picks
=
[...
heads
,
...
tags
,
...
remoteHeads
];
const
placeHolder
=
'
Select a ref to checkout
'
;
const
placeHolder
=
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
)
;
const
choice
=
await
window
.
showQuickPick
<
CheckoutItem
>
(
picks
,
{
placeHolder
});
if
(
!
choice
)
{
...
...
@@ -684,14 +686,14 @@ export class CommandCenter {
const
includeRemotes
=
checkoutType
===
'
all
'
||
checkoutType
===
'
remote
'
;
const
heads
=
this
.
model
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
Head
)
.
map
(
ref
=>
new
Checkout
Item
(
ref
));
.
map
(
ref
=>
new
Merge
Item
(
ref
));
const
remoteHeads
=
(
includeRemotes
?
this
.
model
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
RemoteHead
)
:
[])
.
map
(
ref
=>
new
CheckoutRemoteHead
Item
(
ref
));
.
map
(
ref
=>
new
Merge
Item
(
ref
));
const
picks
=
[...
heads
,
...
remoteHeads
];
const
placeHolder
=
'
Select a ref to checkout
'
;
const
choice
=
await
window
.
showQuickPick
<
CheckoutBasic
Item
>
(
picks
,
{
placeHolder
});
const
placeHolder
=
localize
(
'
select a branch to merge from
'
,
'
Select a branch to merge from
'
)
;
const
choice
=
await
window
.
showQuickPick
<
Merge
Item
>
(
picks
,
{
placeHolder
});
if
(
!
choice
)
{
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录