Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
842421f3
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,发现更多精彩内容 >>
提交
842421f3
编写于
6月 26, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
catch merge conflicts
上级
df9c7d01
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
10 deletion
+30
-10
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+16
-5
extensions/git/src/git.ts
extensions/git/src/git.ts
+12
-3
extensions/git/src/model.ts
extensions/git/src/model.ts
+2
-2
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
842421f3
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
'
use strict
'
;
'
use strict
'
;
import
{
Uri
,
commands
,
scm
,
Disposable
,
window
,
workspace
,
QuickPickItem
,
OutputChannel
,
Range
,
WorkspaceEdit
,
Position
,
LineChange
,
SourceControlResourceState
,
TextDocumentShowOptions
,
ViewColumn
}
from
'
vscode
'
;
import
{
Uri
,
commands
,
scm
,
Disposable
,
window
,
workspace
,
QuickPickItem
,
OutputChannel
,
Range
,
WorkspaceEdit
,
Position
,
LineChange
,
SourceControlResourceState
,
TextDocumentShowOptions
,
ViewColumn
}
from
'
vscode
'
;
import
{
Ref
,
RefType
,
Git
,
GitErrorCodes
}
from
'
./git
'
;
import
{
Ref
,
RefType
,
Git
,
GitErrorCodes
,
Branch
}
from
'
./git
'
;
import
{
Model
,
Resource
,
Status
,
CommitOptions
,
WorkingTreeGroup
,
IndexGroup
,
MergeGroup
}
from
'
./model
'
;
import
{
Model
,
Resource
,
Status
,
CommitOptions
,
WorkingTreeGroup
,
IndexGroup
,
MergeGroup
}
from
'
./model
'
;
import
{
toGitUri
,
fromGitUri
}
from
'
./uri
'
;
import
{
toGitUri
,
fromGitUri
}
from
'
./uri
'
;
import
{
applyLineChanges
,
intersectDiffWithRange
,
toLineRanges
,
invertLineChange
}
from
'
./staging
'
;
import
{
applyLineChanges
,
intersectDiffWithRange
,
toLineRanges
,
invertLineChange
}
from
'
./staging
'
;
...
@@ -85,7 +85,7 @@ class MergeItem implements QuickPickItem {
...
@@ -85,7 +85,7 @@ class MergeItem implements QuickPickItem {
constructor
(
protected
ref
:
Ref
)
{
}
constructor
(
protected
ref
:
Ref
)
{
}
async
run
(
model
:
Model
):
Promise
<
void
>
{
async
run
(
model
:
Model
):
Promise
<
void
>
{
await
model
.
merge
(
this
.
ref
.
name
);
await
model
.
merge
(
this
.
ref
.
name
!
||
this
.
ref
.
commit
!
);
}
}
}
}
...
@@ -783,10 +783,12 @@ export class CommandCenter {
...
@@ -783,10 +783,12 @@ export class CommandCenter {
const
includeRemotes
=
checkoutType
===
'
all
'
||
checkoutType
===
'
remote
'
;
const
includeRemotes
=
checkoutType
===
'
all
'
||
checkoutType
===
'
remote
'
;
const
heads
=
this
.
model
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
Head
)
const
heads
=
this
.
model
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
Head
)
.
map
(
ref
=>
new
MergeItem
(
ref
));
.
filter
(
ref
=>
ref
.
name
||
ref
.
commit
)
.
map
(
ref
=>
new
MergeItem
(
ref
as
Branch
));
const
remoteHeads
=
(
includeRemotes
?
this
.
model
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
RemoteHead
)
:
[])
const
remoteHeads
=
(
includeRemotes
?
this
.
model
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
RemoteHead
)
:
[])
.
map
(
ref
=>
new
MergeItem
(
ref
));
.
filter
(
ref
=>
ref
.
name
||
ref
.
commit
)
.
map
(
ref
=>
new
MergeItem
(
ref
as
Branch
));
const
picks
=
[...
heads
,
...
remoteHeads
];
const
picks
=
[...
heads
,
...
remoteHeads
];
const
placeHolder
=
localize
(
'
select a branch to merge from
'
,
'
Select a branch to merge from
'
);
const
placeHolder
=
localize
(
'
select a branch to merge from
'
,
'
Select a branch to merge from
'
);
...
@@ -796,7 +798,16 @@ export class CommandCenter {
...
@@ -796,7 +798,16 @@ export class CommandCenter {
return
;
return
;
}
}
await
choice
.
run
(
this
.
model
);
try
{
await
choice
.
run
(
this
.
model
);
}
catch
(
err
)
{
if
(
err
.
gitErrorCode
!==
GitErrorCodes
.
Conflict
)
{
throw
err
;
}
const
message
=
localize
(
'
merge conflicts
'
,
"
There are merge conflicts. Resolve them before committing.
"
);
await
window
.
showWarningMessage
(
message
);
}
}
}
@
command
(
'
git.pull
'
)
@
command
(
'
git.pull
'
)
...
...
extensions/git/src/git.ts
浏览文件 @
842421f3
...
@@ -654,9 +654,18 @@ export class Repository {
...
@@ -654,9 +654,18 @@ export class Repository {
await
this
.
run
(
args
);
await
this
.
run
(
args
);
}
}
async
merge
(
name
:
string
):
Promise
<
void
>
{
async
merge
(
ref
:
string
):
Promise
<
void
>
{
const
args
=
[
'
merge
'
,
name
];
const
args
=
[
'
merge
'
,
ref
];
await
this
.
run
(
args
);
try
{
await
this
.
run
(
args
);
}
catch
(
err
)
{
if
(
/^CONFLICT /m
.
test
(
err
.
stdout
||
''
))
{
err
.
gitErrorCode
=
GitErrorCodes
.
Conflict
;
}
throw
err
;
}
}
}
async
clean
(
paths
:
string
[]):
Promise
<
void
>
{
async
clean
(
paths
:
string
[]):
Promise
<
void
>
{
...
...
extensions/git/src/model.ts
浏览文件 @
842421f3
...
@@ -461,8 +461,8 @@ export class Model implements Disposable {
...
@@ -461,8 +461,8 @@ export class Model implements Disposable {
await
this
.
run
(
Operation
.
DeleteBranch
,
()
=>
this
.
repository
.
deleteBranch
(
name
,
force
));
await
this
.
run
(
Operation
.
DeleteBranch
,
()
=>
this
.
repository
.
deleteBranch
(
name
,
force
));
}
}
async
merge
(
name
:
string
):
Promise
<
void
>
{
async
merge
(
ref
:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Merge
,
()
=>
this
.
repository
.
merge
(
name
));
await
this
.
run
(
Operation
.
Merge
,
()
=>
this
.
repository
.
merge
(
ref
));
}
}
async
checkout
(
treeish
:
string
):
Promise
<
void
>
{
async
checkout
(
treeish
:
string
):
Promise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录