Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
501241e5
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,发现更多精彩内容 >>
提交
501241e5
编写于
10月 23, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
9a7fdb4a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
42 deletion
+37
-42
extensions/git/src/api/api1.ts
extensions/git/src/api/api1.ts
+17
-28
extensions/git/src/api/git.d.ts
extensions/git/src/api/git.d.ts
+14
-8
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+6
-6
未找到文件。
extensions/git/src/api/api1.ts
浏览文件 @
501241e5
...
...
@@ -17,23 +17,12 @@ class ApiInputBox implements InputBox {
export
class
ApiChange
implements
Change
{
constructor
(
private
readonly
resource
:
Resource
)
{
}
public
get
resourceUri
():
Uri
{
return
this
.
resource
.
resourceUri
;
}
public
get
status
():
Status
{
return
this
.
resource
.
type
;
}
public
get
original
():
Uri
{
return
this
.
resource
.
original
;
}
get
uri
():
Uri
{
return
this
.
resource
.
resourceUri
;
}
get
originalUri
():
Uri
{
return
this
.
resource
.
original
;
}
get
renameUri
():
Uri
|
undefined
{
return
this
.
resource
.
renameResourceUri
;
}
get
status
():
Status
{
return
this
.
resource
.
type
;
}
public
get
renameResourceUri
():
Uri
|
undefined
{
return
this
.
resource
.
renameResourceUri
;
}
constructor
(
private
readonly
resource
:
Resource
)
{
}
}
export
class
ApiRepositoryState
implements
RepositoryState
{
...
...
@@ -83,14 +72,6 @@ export class ApiRepository implements Repository {
return
this
.
_repository
.
setConfig
(
key
,
value
);
}
show
(
ref
:
string
,
path
:
string
):
Promise
<
string
>
{
return
this
.
_repository
.
show
(
ref
,
path
);
}
getCommit
(
ref
:
string
):
Promise
<
Commit
>
{
return
this
.
_repository
.
getCommit
(
ref
);
}
getObjectDetails
(
treeish
:
string
,
path
:
string
):
Promise
<
{
mode
:
string
;
object
:
string
;
size
:
number
;
}
>
{
return
this
.
_repository
.
getObjectDetails
(
treeish
,
path
);
}
...
...
@@ -103,6 +84,18 @@ export class ApiRepository implements Repository {
return
this
.
_repository
.
buffer
(
ref
,
filePath
);
}
show
(
ref
:
string
,
path
:
string
):
Promise
<
string
>
{
return
this
.
_repository
.
show
(
ref
,
path
);
}
getCommit
(
ref
:
string
):
Promise
<
Commit
>
{
return
this
.
_repository
.
getCommit
(
ref
);
}
clean
(
paths
:
string
[])
{
return
this
.
_repository
.
clean
(
paths
.
map
(
p
=>
Uri
.
file
(
p
)));
}
diffWithHEAD
(
path
:
string
):
Promise
<
string
>
{
return
this
.
_repository
.
diffWithHEAD
(
path
);
}
...
...
@@ -174,10 +167,6 @@ export class ApiRepository implements Repository {
pull
():
Promise
<
void
>
{
return
this
.
_repository
.
pull
();
}
clean
(
filePaths
:
string
[])
{
return
this
.
_repository
.
clean
(
filePaths
.
map
(
p
=>
Uri
.
file
(
p
)));
}
}
export
class
ApiGit
implements
Git
{
...
...
extensions/git/src/api/git.d.ts
浏览文件 @
501241e5
...
...
@@ -78,10 +78,16 @@ export const enum Status {
}
export
interface
Change
{
readonly
resourceUri
:
Uri
;
/**
* Returns either `originalUri` or `renameUri`, depending
* on whether this change is a rename change. When
* in doubt always use `uri` over the other two alternatives.
*/
readonly
uri
:
Uri
;
readonly
originalUri
:
Uri
;
readonly
renameUri
:
Uri
|
undefined
;
readonly
status
:
Status
;
readonly
original
:
Uri
;
readonly
renameResourceUri
:
Uri
|
undefined
;
}
export
interface
RepositoryState
{
...
...
@@ -114,11 +120,13 @@ export interface Repository {
getConfig
(
key
:
string
):
Promise
<
string
>
;
setConfig
(
key
:
string
,
value
:
string
):
Promise
<
string
>
;
show
(
ref
:
string
,
path
:
string
):
Promise
<
string
>
;
getCommit
(
ref
:
string
):
Promise
<
Commit
>
;
getObjectDetails
(
treeish
:
string
,
path
:
string
):
Promise
<
{
mode
:
string
,
object
:
string
,
size
:
number
}
>
;
detectObjectType
(
object
:
string
):
Promise
<
{
mimetype
:
string
,
encoding
?:
string
}
>
;
buffer
(
ref
:
string
,
filePath
:
string
):
Promise
<
Buffer
>
;
buffer
(
ref
:
string
,
path
:
string
):
Promise
<
Buffer
>
;
show
(
ref
:
string
,
path
:
string
):
Promise
<
string
>
;
getCommit
(
ref
:
string
):
Promise
<
Commit
>
;
clean
(
paths
:
string
[]):
Promise
<
void
>
;
diffWithHEAD
(
path
:
string
):
Promise
<
string
>
;
diffWith
(
ref
:
string
,
path
:
string
):
Promise
<
string
>
;
...
...
@@ -144,8 +152,6 @@ export interface Repository {
fetch
(
remote
?:
string
,
ref
?:
string
):
Promise
<
void
>
;
pull
():
Promise
<
void
>
;
clean
(
filePaths
:
string
[]):
Promise
<
void
>
;
}
export
interface
API
{
...
...
extensions/git/src/repository.ts
浏览文件 @
501241e5
...
...
@@ -83,7 +83,7 @@ export class Resource implements SourceControlResourceState {
}
};
private
getIconPath
(
theme
:
string
):
Uri
|
undefined
{
private
getIconPath
(
theme
:
string
):
Uri
{
switch
(
this
.
type
)
{
case
Status
.
INDEX_MODIFIED
:
return
Resource
.
Icons
[
theme
].
Modified
;
case
Status
.
MODIFIED
:
return
Resource
.
Icons
[
theme
].
Modified
;
...
...
@@ -101,7 +101,7 @@ export class Resource implements SourceControlResourceState {
case
Status
.
DELETED_BY_US
:
return
Resource
.
Icons
[
theme
].
Conflict
;
case
Status
.
BOTH_ADDED
:
return
Resource
.
Icons
[
theme
].
Conflict
;
case
Status
.
BOTH_MODIFIED
:
return
Resource
.
Icons
[
theme
].
Conflict
;
default
:
return
;
default
:
throw
new
Error
(
'
Unknown git status:
'
+
this
.
type
)
;
}
}
...
...
@@ -160,7 +160,7 @@ export class Resource implements SourceControlResourceState {
return
{
strikeThrough
,
faded
,
tooltip
,
light
,
dark
,
letter
,
color
,
source
:
'
git.resource
'
/*todo@joh*/
};
}
get
letter
():
string
|
undefined
{
get
letter
():
string
{
switch
(
this
.
type
)
{
case
Status
.
INDEX_MODIFIED
:
case
Status
.
MODIFIED
:
...
...
@@ -188,11 +188,11 @@ export class Resource implements SourceControlResourceState {
case
Status
.
BOTH_MODIFIED
:
return
'
C
'
;
default
:
return
;
throw
new
Error
(
'
Unknown git status:
'
+
this
.
type
)
;
}
}
get
color
():
ThemeColor
|
undefined
{
get
color
():
ThemeColor
{
switch
(
this
.
type
)
{
case
Status
.
INDEX_MODIFIED
:
case
Status
.
MODIFIED
:
...
...
@@ -217,7 +217,7 @@ export class Resource implements SourceControlResourceState {
case
Status
.
BOTH_MODIFIED
:
return
new
ThemeColor
(
'
gitDecoration.conflictingResourceForeground
'
);
default
:
return
;
throw
new
Error
(
'
Unknown git status:
'
+
this
.
type
)
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录