Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a398adac
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,发现更多精彩内容 >>
未验证
提交
a398adac
编写于
1月 22, 2020
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert git uri changes
fixes #88775
上级
e1f1744c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
33 deletion
+18
-33
extensions/git/package.json
extensions/git/package.json
+9
-9
extensions/git/src/fileSystemProvider.ts
extensions/git/src/fileSystemProvider.ts
+2
-2
extensions/git/src/model.ts
extensions/git/src/model.ts
+1
-1
extensions/git/src/uri.ts
extensions/git/src/uri.ts
+4
-19
extensions/image-preview/src/preview.ts
extensions/image-preview/src/preview.ts
+1
-1
src/vs/workbench/services/search/common/searchService.ts
src/vs/workbench/services/search/common/searchService.ts
+1
-1
未找到文件。
extensions/git/package.json
浏览文件 @
a398adac
...
...
@@ -1194,7 +1194,7 @@
{
"command"
:
"git.openFile"
,
"group"
:
"navigation"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command"
:
"git.openChange"
,
...
...
@@ -1204,44 +1204,44 @@
{
"command"
:
"git.stageSelectedRanges"
,
"group"
:
"2_git@1"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command"
:
"git.unstageSelectedRanges"
,
"group"
:
"2_git@2"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command"
:
"git.revertSelectedRanges"
,
"group"
:
"2_git@3"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
}
],
"editor/context"
:
[
{
"command"
:
"git.stageSelectedRanges"
,
"group"
:
"2_git@1"
,
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command"
:
"git.unstageSelectedRanges"
,
"group"
:
"2_git@2"
,
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command"
:
"git.revertSelectedRanges"
,
"group"
:
"2_git@3"
,
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
}
],
"scm/change/title"
:
[
{
"command"
:
"git.stageChange"
,
"when"
:
"originalResourceScheme == git
fs
"
"when"
:
"originalResourceScheme == git"
},
{
"command"
:
"git.revertChange"
,
"when"
:
"originalResourceScheme == git
fs
"
"when"
:
"originalResourceScheme == git"
}
]
},
...
...
extensions/git/src/fileSystemProvider.ts
浏览文件 @
a398adac
...
...
@@ -47,9 +47,9 @@ export class GitFileSystemProvider implements FileSystemProvider {
this
.
disposables
.
push
(
model
.
onDidChangeRepository
(
this
.
onDidChangeRepository
,
this
),
model
.
onDidChangeOriginalResource
(
this
.
onDidChangeOriginalResource
,
this
),
workspace
.
registerFileSystemProvider
(
'
git
fs
'
,
this
,
{
isReadonly
:
true
,
isCaseSensitive
:
true
}),
workspace
.
registerFileSystemProvider
(
'
git
'
,
this
,
{
isReadonly
:
true
,
isCaseSensitive
:
true
}),
workspace
.
registerResourceLabelFormatter
({
scheme
:
'
git
fs
'
,
scheme
:
'
git
'
,
formatting
:
{
label
:
'
${path} (git)
'
,
separator
:
'
/
'
...
...
extensions/git/src/model.ts
浏览文件 @
a398adac
...
...
@@ -392,7 +392,7 @@ export class Model {
if
(
hint
instanceof
Uri
)
{
let
resourcePath
:
string
;
if
(
hint
.
scheme
===
'
git
'
||
hint
.
scheme
===
'
gitfs
'
)
{
if
(
hint
.
scheme
===
'
git
'
)
{
resourcePath
=
fromGitUri
(
hint
).
path
;
}
else
{
resourcePath
=
hint
.
fsPath
;
...
...
extensions/git/src/uri.ts
浏览文件 @
a398adac
...
...
@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
import
{
Uri
}
from
'
vscode
'
;
import
*
as
qs
from
'
querystring
'
;
export
interface
GitUriParams
{
path
:
string
;
...
...
@@ -13,25 +12,11 @@ export interface GitUriParams {
}
export
function
isGitUri
(
uri
:
Uri
):
boolean
{
return
/^git
(
fs
)?
$/
.
test
(
uri
.
scheme
);
return
/^git$/
.
test
(
uri
.
scheme
);
}
export
function
fromGitUri
(
uri
:
Uri
):
GitUriParams
{
const
result
=
qs
.
parse
(
uri
.
query
)
as
any
;
if
(
!
result
)
{
throw
new
Error
(
'
Invalid git URI: empty query
'
);
}
if
(
typeof
result
.
path
!==
'
string
'
)
{
throw
new
Error
(
'
Invalid git URI: missing path
'
);
}
if
(
typeof
result
.
ref
!==
'
string
'
)
{
throw
new
Error
(
'
Invalid git URI: missing ref
'
);
}
return
result
;
return
JSON
.
parse
(
uri
.
query
);
}
export
interface
GitUriOptions
{
...
...
@@ -61,8 +46,8 @@ export function toGitUri(uri: Uri, ref: string, options: GitUriOptions = {}): Ur
}
return
uri
.
with
({
scheme
:
'
git
fs
'
,
scheme
:
'
git
'
,
path
,
query
:
qs
.
stringify
(
params
as
any
)
query
:
JSON
.
stringify
(
params
)
});
}
extensions/image-preview/src/preview.ts
浏览文件 @
a398adac
...
...
@@ -236,7 +236,7 @@ class Preview extends Disposable {
}
private
async
getResourcePath
(
webviewEditor
:
vscode
.
WebviewPanel
,
resource
:
vscode
.
Uri
,
version
:
string
):
Promise
<
string
>
{
if
(
resource
.
scheme
===
'
git
fs
'
)
{
if
(
resource
.
scheme
===
'
git
'
)
{
const
stat
=
await
vscode
.
workspace
.
fs
.
stat
(
resource
);
if
(
stat
.
size
===
0
)
{
return
this
.
emptyPngDataUri
;
...
...
src/vs/workbench/services/search/common/searchService.ts
浏览文件 @
a398adac
...
...
@@ -406,7 +406,7 @@ export class SearchService extends Disposable implements ISearchService {
}
// Exclude files from the git FileSystemProvider, e.g. to prevent open staged files from showing in search results
if
(
resource
.
scheme
===
'
git
fs
'
)
{
if
(
resource
.
scheme
===
'
git
'
)
{
return
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录