Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
980fb4b0
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,发现更多精彩内容 >>
未验证
提交
980fb4b0
编写于
10月 25, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
差异文件
Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342
上级
b8d2bad6
d235f183
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
49 addition
and
0 deletion
+49
-0
extensions/git/package.json
extensions/git/package.json
+14
-0
extensions/git/package.nls.json
extensions/git/package.nls.json
+1
-0
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+12
-0
extensions/git/src/git.ts
extensions/git/src/git.ts
+18
-0
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+4
-0
未找到文件。
extensions/git/package.json
浏览文件 @
980fb4b0
...
...
@@ -401,6 +401,11 @@
"command"
:
"git.stashApplyLatest"
,
"title"
:
"%command.stashApplyLatest%"
,
"category"
:
"Git"
},
{
"command"
:
"git.stashDrop"
,
"title"
:
"%command.stashDrop%"
,
"category"
:
"Git"
}
],
"menus"
:
{
...
...
@@ -660,6 +665,10 @@
{
"command"
:
"git.stashApplyLatest"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command"
:
"git.stashDrop"
,
"when"
:
"config.get.enabled && gitOpenRepositoryCount != 0"
}
],
"scm/title"
:
[
...
...
@@ -813,6 +822,11 @@
"group"
:
"6_stash"
,
"when"
:
"scmProvider == git"
},
{
"command"
:
"git.stashDrop"
,
"group"
:
"6_stash"
,
"when"
:
"scmProvider == git"
},
{
"command"
:
"git.showOutput"
,
"group"
:
"7_repository"
,
...
...
extensions/git/package.nls.json
浏览文件 @
980fb4b0
...
...
@@ -64,6 +64,7 @@
"command.stashPopLatest"
:
"Pop Latest Stash"
,
"command.stashApply"
:
"Apply Stash..."
,
"command.stashApplyLatest"
:
"Apply Latest Stash"
,
"command.stashDrop"
:
"Drop Stash..."
,
"config.enabled"
:
"Whether git is enabled."
,
"config.path"
:
"Path and filename of the git executable, e.g. `C:
\\
Program Files
\\
Git
\\
bin
\\
git.exe` (Windows)."
,
"config.autoRepositoryDetection"
:
"Configures when repositories should be automatically detected."
,
...
...
extensions/git/src/commands.ts
浏览文件 @
980fb4b0
...
...
@@ -2241,6 +2241,18 @@ export class CommandCenter {
await
repository
.
applyStash
();
}
@
command
(
'
git.stashDrop
'
,
{
repository
:
true
})
async
stashDrop
(
repository
:
Repository
):
Promise
<
void
>
{
const
placeHolder
=
localize
(
'
pick stash to drop
'
,
"
Pick a stash to drop
"
);
const
stash
=
await
this
.
pickStash
(
repository
,
placeHolder
);
if
(
!
stash
)
{
return
;
}
await
repository
.
dropStash
(
stash
.
index
);
}
private
async
pickStash
(
repository
:
Repository
,
placeHolder
:
string
):
Promise
<
Stash
|
undefined
>
{
const
stashes
=
await
repository
.
getStashes
();
...
...
extensions/git/src/git.ts
浏览文件 @
980fb4b0
...
...
@@ -1597,6 +1597,24 @@ export class Repository {
}
}
async
dropStash
(
index
:
number
):
Promise
<
void
>
{
const
args
=
[
'
stash
'
,
'
drop
'
];
if
(
typeof
index
===
'
number
'
)
{
args
.
push
(
`stash@{
${
index
}
}`
);
try
{
await
this
.
run
(
args
);
}
}
catch
(
err
)
{
if
(
/No stash found/
.
test
(
err
.
stderr
||
''
))
{
err
.
gitErrorCode
=
GitErrorCodes
.
NoStashFound
;
}
throw
err
;
}
}
getStatus
(
limit
=
5000
):
Promise
<
{
status
:
IFileStatus
[];
didHitLimit
:
boolean
;
}
>
{
return
new
Promise
<
{
status
:
IFileStatus
[];
didHitLimit
:
boolean
;
}
>
((
c
,
e
)
=>
{
const
parser
=
new
GitStatusParser
();
...
...
extensions/git/src/repository.ts
浏览文件 @
980fb4b0
...
...
@@ -1254,6 +1254,10 @@ export class Repository implements Disposable {
return
await
this
.
run
(
Operation
.
Stash
,
()
=>
this
.
repository
.
popStash
(
index
));
}
async
dropStash
(
index
?:
number
):
Promise
<
void
>
{
return
await
this
.
run
(
Operation
.
Stash
,
()
=>
this
.
repository
.
dropStash
(
index
));
}
async
applyStash
(
index
?:
number
):
Promise
<
void
>
{
return
await
this
.
run
(
Operation
.
Stash
,
()
=>
this
.
repository
.
applyStash
(
index
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录