Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a915b675
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,发现更多精彩内容 >>
提交
a915b675
编写于
9月 12, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
introduce git.fetchOnPull
related to #56463
上级
00b7b2d8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
4 deletion
+39
-4
extensions/git/package.json
extensions/git/package.json
+6
-0
extensions/git/package.nls.json
extensions/git/package.nls.json
+1
-0
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+32
-4
未找到文件。
extensions/git/package.json
浏览文件 @
a915b675
...
...
@@ -1074,6 +1074,12 @@
"scope"
:
"resource"
,
"default"
:
false
,
"description"
:
"%config.rebaseWhenSync%"
},
"git.fetchOnPull"
:
{
"type"
:
"boolean"
,
"scope"
:
"resource"
,
"default"
:
false
,
"description"
:
"%config.fetchOnPull%"
}
}
},
...
...
extensions/git/package.nls.json
浏览文件 @
a915b675
...
...
@@ -92,6 +92,7 @@
"config.showProgress"
:
"Controls whether git actions should show progress."
,
"config.rebaseWhenSync"
:
"Use rebase instead of merge when running the sync command."
,
"config.confirmEmptyCommits"
:
"Always confirm the creation of empty commits."
,
"config.fetchOnPull"
:
"Fetch all branches when pulling or just the current one."
,
"colors.modified"
:
"Color for modified resources."
,
"colors.deleted"
:
"Color for deleted resources."
,
"colors.untracked"
:
"Color for untracked resources."
,
...
...
extensions/git/src/repository.ts
浏览文件 @
a915b675
...
...
@@ -914,7 +914,14 @@ export class Repository implements Disposable {
branch
=
`
${
head
.
upstream
.
name
}
`
;
}
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
true
,
remote
,
branch
));
const
config
=
workspace
.
getConfiguration
(
'
git
'
,
Uri
.
file
(
this
.
root
));
const
fetchOnPull
=
config
.
get
<
boolean
>
(
'
fetchOnPull
'
);
if
(
fetchOnPull
)
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
true
));
}
else
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
true
,
remote
,
branch
));
}
}
@
throttle
...
...
@@ -927,11 +934,25 @@ export class Repository implements Disposable {
branch
=
`
${
head
.
upstream
.
name
}
`
;
}
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
false
,
remote
,
branch
));
const
config
=
workspace
.
getConfiguration
(
'
git
'
,
Uri
.
file
(
this
.
root
));
const
fetchOnPull
=
config
.
get
<
boolean
>
(
'
fetchOnPull
'
);
if
(
fetchOnPull
)
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
false
));
}
else
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
false
,
remote
,
branch
));
}
}
async
pullFrom
(
rebase
?:
boolean
,
remote
?:
string
,
branch
?:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
rebase
,
remote
,
branch
));
const
config
=
workspace
.
getConfiguration
(
'
git
'
,
Uri
.
file
(
this
.
root
));
const
fetchOnPull
=
config
.
get
<
boolean
>
(
'
fetchOnPull
'
);
if
(
fetchOnPull
)
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
rebase
));
}
else
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
rebase
,
remote
,
branch
));
}
}
@
throttle
...
...
@@ -977,7 +998,14 @@ export class Repository implements Disposable {
}
await
this
.
run
(
Operation
.
Sync
,
async
()
=>
{
await
this
.
repository
.
pull
(
rebase
,
remoteName
,
pullBranch
);
const
config
=
workspace
.
getConfiguration
(
'
git
'
,
Uri
.
file
(
this
.
root
));
const
fetchOnPull
=
config
.
get
<
boolean
>
(
'
fetchOnPull
'
);
if
(
fetchOnPull
)
{
await
this
.
repository
.
pull
(
rebase
);
}
else
{
await
this
.
repository
.
pull
(
rebase
,
remoteName
,
pullBranch
);
}
const
remote
=
this
.
remotes
.
find
(
r
=>
r
.
name
===
remoteName
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录