Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
14380f97
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,发现更多精彩内容 >>
提交
14380f97
编写于
6月 26, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'bc/Feature26738' of
https://github.com/BugraC/vscode
into BugraC-bc/Feature26738
上级
7b90f16e
39f33ae2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
62 addition
and
6 deletion
+62
-6
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
+30
-0
extensions/git/src/git.ts
extensions/git/src/git.ts
+13
-2
extensions/git/src/model.ts
extensions/git/src/model.ts
+4
-4
未找到文件。
extensions/git/package.json
浏览文件 @
14380f97
...
...
@@ -192,6 +192,11 @@
"title"
:
"%command.pullRebase%"
,
"category"
:
"Git"
},
{
"command"
:
"git.pullFromRemoteBranch"
,
"title"
:
"%command.pullFromRemoteBranch%"
,
"category"
:
"Git"
},
{
"command"
:
"git.push"
,
"title"
:
"%command.push%"
,
...
...
@@ -321,6 +326,10 @@
"command"
:
"git.pull"
,
"when"
:
"config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command"
:
"git.pullFromRemoteBranch"
,
"when"
:
"config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command"
:
"git.pullRebase"
,
"when"
:
"config.git.enabled && scmProvider == git && gitState == idle"
...
...
@@ -377,6 +386,11 @@
"group"
:
"1_sync"
,
"when"
:
"config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command"
:
"git.pullFromRemoteBranch"
,
"group"
:
"1_sync"
,
"when"
:
"config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command"
:
"git.push"
,
"group"
:
"1_sync"
,
...
...
extensions/git/package.nls.json
浏览文件 @
14380f97
...
...
@@ -25,6 +25,7 @@
"command.merge"
:
"Merge Branch..."
,
"command.pull"
:
"Pull"
,
"command.pullRebase"
:
"Pull (Rebase)"
,
"command.pullFromRemoteBranch"
:
"Pull From..."
,
"command.push"
:
"Push"
,
"command.pushTo"
:
"Push to..."
,
"command.sync"
:
"Sync"
,
...
...
extensions/git/src/commands.ts
浏览文件 @
14380f97
...
...
@@ -810,6 +810,36 @@ export class CommandCenter {
}
}
@
command
(
'
git.pullFromRemoteBranch
'
)
async
pullFrom
():
Promise
<
void
>
{
const
remotes
=
this
.
model
.
remotes
;
if
(
remotes
.
length
===
0
)
{
window
.
showWarningMessage
(
localize
(
'
no remotes to pull
'
,
"
Your repository has no remotes configured to pull from.
"
));
return
;
}
const
picks
=
remotes
.
map
(
r
=>
({
label
:
r
.
name
,
description
:
r
.
url
}));
const
placeHolder
=
localize
(
'
pick remote pull repo
'
,
"
Pick a remote to pull the branch from
"
);
const
pick
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
if
(
!
pick
)
{
return
;
}
const
branchName
=
await
window
.
showInputBox
({
placeHolder
:
localize
(
'
branch name
'
,
"
Branch name
"
),
prompt
:
localize
(
'
provide branch name
'
,
"
Please provide a branch name
"
),
ignoreFocusOut
:
true
});
if
(
!
branchName
)
{
return
;
}
this
.
model
.
pull
(
false
,
pick
.
label
,
branchName
);
}
@
command
(
'
git.pull
'
)
async
pull
():
Promise
<
void
>
{
const
remotes
=
this
.
model
.
remotes
;
...
...
extensions/git/src/git.ts
浏览文件 @
14380f97
...
...
@@ -270,7 +270,8 @@ export const GitErrorCodes = {
CantAccessRemote
:
'
CantAccessRemote
'
,
RepositoryNotFound
:
'
RepositoryNotFound
'
,
RepositoryIsLocked
:
'
RepositoryIsLocked
'
,
BranchNotFullyMerged
:
'
BranchNotFullyMerged
'
BranchNotFullyMerged
:
'
BranchNotFullyMerged
'
,
NoRemoteReference
:
'
NoRemoteReference
'
};
function
getGitErrorCode
(
stderr
:
string
):
string
|
undefined
{
...
...
@@ -290,6 +291,8 @@ function getGitErrorCode(stderr: string): string | undefined {
return
GitErrorCodes
.
CantAccessRemote
;
}
else
if
(
/branch '.+' is not fully merged/
.
test
(
stderr
))
{
return
GitErrorCodes
.
BranchNotFullyMerged
;
}
else
if
(
/Couldn
\'
t find remote ref/
.
test
(
stderr
))
{
return
GitErrorCodes
.
NoRemoteReference
;
}
return
void
0
;
...
...
@@ -748,13 +751,21 @@ export class Repository {
}
}
async
pull
(
rebase
?:
boolean
):
Promise
<
void
>
{
async
pull
(
rebase
?:
boolean
,
remote
?:
string
,
name
?:
string
):
Promise
<
void
>
{
const
args
=
[
'
pull
'
];
if
(
rebase
)
{
args
.
push
(
'
-r
'
);
}
if
(
remote
)
{
args
.
push
(
remote
);
}
if
(
name
)
{
args
.
push
(
name
);
}
try
{
await
this
.
run
(
args
);
}
catch
(
err
)
{
...
...
extensions/git/src/model.ts
浏览文件 @
14380f97
...
...
@@ -487,13 +487,13 @@ export class Model implements Disposable {
}
@
throttle
async
pull
():
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
());
async
pull
WithRebase
():
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
true
));
}
@
throttle
async
pull
WithRebase
(
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
tru
e
));
async
pull
(
rebase
?:
boolean
,
remote
?:
string
,
name
?:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
rebase
,
remote
,
nam
e
));
}
@
throttle
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录