Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ca7ae008
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,发现更多精彩内容 >>
提交
ca7ae008
编写于
9月 13, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
9c06533a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
23 deletion
+16
-23
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+16
-23
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
ca7ae008
...
...
@@ -1702,20 +1702,21 @@ export class CommandCenter {
@
command
(
'
git.stashPop
'
,
{
repository
:
true
})
async
stashPop
(
repository
:
Repository
):
Promise
<
void
>
{
const
placeHolder
=
localize
(
'
pick stash to pop
'
,
"
Pick a stash to pop
"
);
const
choice
=
await
this
.
pickStash
(
repository
,
placeHolder
);
const
stash
=
await
this
.
pickStash
(
repository
,
placeHolder
);
if
(
!
choice
)
{
if
(
!
stash
)
{
return
;
}
await
repository
.
popStash
(
choice
.
id
);
await
repository
.
popStash
(
stash
.
index
);
}
@
command
(
'
git.stashPopLatest
'
,
{
repository
:
true
})
async
stashPopLatest
(
repository
:
Repository
):
Promise
<
void
>
{
const
stashes
=
await
repository
.
getStashes
();
if
(
!
this
.
anyStashesAvailableToRestore
(
stashes
))
{
if
(
stashes
.
length
===
0
)
{
window
.
showInformationMessage
(
localize
(
'
no stashes
'
,
"
There are no stashes in the repository.
"
));
return
;
}
...
...
@@ -1725,48 +1726,40 @@ export class CommandCenter {
@
command
(
'
git.stashApply
'
,
{
repository
:
true
})
async
stashApply
(
repository
:
Repository
):
Promise
<
void
>
{
const
placeHolder
=
localize
(
'
pick stash to apply
'
,
"
Pick a stash to apply
"
);
const
choice
=
await
this
.
pickStash
(
repository
,
placeHolder
);
const
stash
=
await
this
.
pickStash
(
repository
,
placeHolder
);
if
(
!
choice
)
{
if
(
!
stash
)
{
return
;
}
await
repository
.
applyStash
(
choice
.
id
);
await
repository
.
applyStash
(
stash
.
index
);
}
@
command
(
'
git.stashApplyLatest
'
,
{
repository
:
true
})
async
stashApplyLatest
(
repository
:
Repository
):
Promise
<
void
>
{
const
stashes
=
await
repository
.
getStashes
();
if
(
!
this
.
anyStashesAvailableToRestore
(
stashes
))
{
if
(
stashes
.
length
===
0
)
{
window
.
showInformationMessage
(
localize
(
'
no stashes
'
,
"
There are no stashes in the repository.
"
));
return
;
}
await
repository
.
applyStash
();
}
private
anyStashesAvailableToRestore
(
stashes
:
Stash
[]):
boolean
{
const
stashesAvailable
=
stashes
.
length
>
0
;
if
(
!
stashesAvailable
)
{
window
.
showInformationMessage
(
localize
(
'
no stashes
'
,
"
There are no stashes to restore.
"
));
}
return
stashesAvailable
;
}
private
async
pickStash
(
repository
:
Repository
,
placeHolder
:
string
)
{
private
async
pickStash
(
repository
:
Repository
,
placeHolder
:
string
):
Promise
<
Stash
|
undefined
>
{
const
stashes
=
await
repository
.
getStashes
();
if
(
!
this
.
anyStashesAvailableToRestore
(
stashes
))
{
if
(
stashes
.
length
===
0
)
{
window
.
showInformationMessage
(
localize
(
'
no stashes
'
,
"
There are no stashes in the repository.
"
));
return
;
}
const
picks
=
stashes
.
map
(
r
=>
({
label
:
`#
${
r
.
index
}
:
${
r
.
description
}
`
,
description
:
''
,
details
:
''
,
id
:
r
.
index
}));
return
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
const
picks
=
stashes
.
map
(
stash
=>
({
label
:
`#
${
stash
.
index
}
:
${
stash
.
description
}
`
,
description
:
''
,
details
:
''
,
stash
}));
const
result
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
return
result
&&
result
.
stash
;
}
private
createCommand
(
id
:
string
,
key
:
string
,
method
:
Function
,
options
:
CommandOptions
):
(...
args
:
any
[])
=>
any
{
const
result
=
(...
args
:
any
[])
=>
{
let
result
:
Promise
<
any
>
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录