Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9d946009
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,发现更多精彩内容 >>
提交
9d946009
编写于
9月 22, 2018
作者:
C
Christian Alexander
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(git): add display handling of files added by git add -N
上级
905c4ac6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
0 deletion
+7
-0
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+1
-0
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+6
-0
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
9d946009
...
...
@@ -327,6 +327,7 @@ export class CommandCenter {
case
Status
.
MODIFIED
:
case
Status
.
UNTRACKED
:
case
Status
.
IGNORED
:
case
Status
.
INTENT_TO_ADD
:
const
repository
=
this
.
model
.
getRepository
(
resource
.
resourceUri
);
if
(
!
repository
)
{
...
...
extensions/git/src/repository.ts
浏览文件 @
9d946009
...
...
@@ -42,6 +42,7 @@ export const enum Status {
DELETED
,
UNTRACKED
,
IGNORED
,
INTENT_TO_ADD
,
ADDED_BY_US
,
ADDED_BY_THEM
,
...
...
@@ -117,6 +118,7 @@ export class Resource implements SourceControlResourceState {
case
Status
.
INDEX_COPIED
:
return
Resource
.
Icons
[
theme
].
Copied
;
case
Status
.
UNTRACKED
:
return
Resource
.
Icons
[
theme
].
Untracked
;
case
Status
.
IGNORED
:
return
Resource
.
Icons
[
theme
].
Ignored
;
case
Status
.
INTENT_TO_ADD
:
return
Resource
.
Icons
[
theme
].
Added
;
case
Status
.
BOTH_DELETED
:
return
Resource
.
Icons
[
theme
].
Conflict
;
case
Status
.
ADDED_BY_US
:
return
Resource
.
Icons
[
theme
].
Conflict
;
case
Status
.
DELETED_BY_THEM
:
return
Resource
.
Icons
[
theme
].
Conflict
;
...
...
@@ -138,6 +140,7 @@ export class Resource implements SourceControlResourceState {
case
Status
.
INDEX_COPIED
:
return
localize
(
'
index copied
'
,
"
Index Copied
"
);
case
Status
.
UNTRACKED
:
return
localize
(
'
untracked
'
,
"
Untracked
"
);
case
Status
.
IGNORED
:
return
localize
(
'
ignored
'
,
"
Ignored
"
);
case
Status
.
INTENT_TO_ADD
:
return
localize
(
'
intent to add
'
,
"
Intent to Add
"
);
case
Status
.
BOTH_DELETED
:
return
localize
(
'
both deleted
'
,
"
Both Deleted
"
);
case
Status
.
ADDED_BY_US
:
return
localize
(
'
added by us
'
,
"
Added By Us
"
);
case
Status
.
DELETED_BY_THEM
:
return
localize
(
'
deleted by them
'
,
"
Deleted By Them
"
);
...
...
@@ -188,6 +191,7 @@ export class Resource implements SourceControlResourceState {
case
Status
.
MODIFIED
:
return
'
M
'
;
case
Status
.
INDEX_ADDED
:
case
Status
.
INTENT_TO_ADD
:
return
'
A
'
;
case
Status
.
INDEX_DELETED
:
case
Status
.
DELETED
:
...
...
@@ -221,6 +225,7 @@ export class Resource implements SourceControlResourceState {
case
Status
.
DELETED
:
return
new
ThemeColor
(
'
gitDecoration.deletedResourceForeground
'
);
case
Status
.
INDEX_ADDED
:
case
Status
.
INTENT_TO_ADD
:
return
new
ThemeColor
(
'
gitDecoration.addedResourceForeground
'
);
case
Status
.
INDEX_RENAMED
:
// todo@joh - special color?
case
Status
.
UNTRACKED
:
...
...
@@ -1286,6 +1291,7 @@ export class Repository implements Disposable {
switch
(
raw
.
y
)
{
case
'
M
'
:
workingTree
.
push
(
new
Resource
(
ResourceGroupType
.
WorkingTree
,
uri
,
Status
.
MODIFIED
,
useIcons
,
renameUri
));
break
;
case
'
D
'
:
workingTree
.
push
(
new
Resource
(
ResourceGroupType
.
WorkingTree
,
uri
,
Status
.
DELETED
,
useIcons
,
renameUri
));
break
;
case
'
A
'
:
workingTree
.
push
(
new
Resource
(
ResourceGroupType
.
WorkingTree
,
uri
,
Status
.
INTENT_TO_ADD
,
useIcons
,
renameUri
));
break
;
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录