Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b3b664dd
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,发现更多精彩内容 >>
提交
b3b664dd
编写于
11月 10, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lint: fix gitActions layer breakage
#15293
上级
6c7f9c9a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
24 deletion
+18
-24
src/vs/workbench/parts/git/browser/gitActions.ts
src/vs/workbench/parts/git/browser/gitActions.ts
+18
-24
未找到文件。
src/vs/workbench/parts/git/browser/gitActions.ts
浏览文件 @
b3b664dd
...
...
@@ -22,14 +22,13 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import
{
IEditor
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IEventService
}
from
'
vs/platform/event/common/event
'
;
import
{
IFileService
,
IFileStat
}
from
'
vs/platform/files/common/files
'
;
import
{
IMessageService
,
IConfirmation
}
from
'
vs/platform/message/common/message
'
;
import
{
IMessageService
,
IConfirmation
,
IChoiceService
}
from
'
vs/platform/message/common/message
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IGitService
,
IFileStatus
,
Status
,
StatusType
,
ServiceState
,
IModel
,
IBranch
,
GitErrorCodes
,
IGitConfiguration
}
from
'
vs/workbench/parts/git/common/git
'
;
import
{
IQuickOpenService
}
from
'
vs/workbench/services/quickopen/common/quickOpenService
'
;
import
paths
=
require
(
'
vs/base/common/paths
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
{
IWindowIPCService
}
from
'
vs/workbench/services/window/electron-browser/windowService
'
;
import
{
IConfigurationEditingService
,
ConfigurationTarget
}
from
'
vs/workbench/services/configuration/common/configurationEditing
'
;
function
flatten
(
context
?:
any
,
preferFocus
=
false
):
IFileStatus
[]
{
...
...
@@ -1152,7 +1151,7 @@ export class SyncAction extends GitAction {
@
IGitService
gitService
:
IGitService
,
@
IConfigurationService
private
configurationService
:
IConfigurationService
,
@
IConfigurationEditingService
private
configurationEditingService
:
IConfigurationEditingService
,
@
I
WindowIPCService
private
windowService
:
IWindowIPC
Service
@
I
ChoiceService
private
choiceService
:
IChoice
Service
)
{
super
(
id
,
label
,
'
git-action sync
'
,
gitService
);
}
...
...
@@ -1187,30 +1186,25 @@ export class SyncAction extends GitAction {
return
this
.
sync
();
}
const
model
=
this
.
gitService
.
getModel
();
const
HEAD
=
model
.
getHEAD
();
const
window
=
this
.
windowService
.
getWindow
();
const
choice
=
window
.
showMessageBox
({
title
:
SyncAction
.
LABEL
,
message
:
nls
.
localize
(
'
sync is unpredictable
'
,
"
This action will push and pull commits to and from '{0}'.
"
,
HEAD
.
upstream
),
type
:
'
warning
'
,
detail
:
nls
.
localize
(
'
do you want to continue
'
,
"
Are you sure you want to continue?
"
),
buttons
:
[
nls
.
localize
(
'
ok
'
,
"
OK
"
),
nls
.
localize
(
'
cancel
'
,
"
Cancel
"
),
nls
.
localize
(
'
never again
'
,
"
OK, Never Show Again
"
)],
noLink
:
true
,
cancelId
:
1
const
message
=
nls
.
localize
(
'
sync is unpredictable
'
,
"
This action will push and pull commits to and from '{0}'.
"
,
HEAD
.
upstream
);
const
options
=
[
nls
.
localize
(
'
ok
'
,
"
OK
"
),
nls
.
localize
(
'
cancel
'
,
"
Cancel
"
),
nls
.
localize
(
'
never again
'
,
"
OK, Never Show Again
"
)];
return
this
.
choiceService
.
choose
(
Severity
.
Warning
,
message
,
options
).
then
(
choice
=>
{
switch
(
choice
)
{
case
0
:
return
this
.
sync
();
case
1
:
return
TPromise
.
as
(
null
);
case
2
:
return
this
.
configurationEditingService
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
'
git.confirmSync
'
,
value
:
false
})
.
then
(()
=>
this
.
sync
());
default
:
return
TPromise
.
as
(
null
);
}
});
switch
(
choice
)
{
case
0
:
return
this
.
sync
();
case
1
:
return
TPromise
.
as
(
null
);
case
2
:
return
this
.
configurationEditingService
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
'
git.confirmSync
'
,
value
:
false
})
.
then
(()
=>
this
.
sync
());
default
:
return
TPromise
.
as
(
null
);
}
}
private
sync
():
TPromise
<
any
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录