Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e055299e
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,发现更多精彩内容 >>
未验证
提交
e055299e
编写于
11月 20, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix git commands
上级
6df05c85
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
13 deletion
+17
-13
extensions/git/package.json
extensions/git/package.json
+9
-9
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+4
-4
extensions/git/src/uri.ts
extensions/git/src/uri.ts
+4
-0
未找到文件。
extensions/git/package.json
浏览文件 @
e055299e
...
...
@@ -1194,7 +1194,7 @@
{
"command"
:
"git.openFile"
,
"group"
:
"navigation"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
},
{
"command"
:
"git.openChange"
,
...
...
@@ -1204,44 +1204,44 @@
{
"command"
:
"git.stageSelectedRanges"
,
"group"
:
"2_git@1"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
},
{
"command"
:
"git.unstageSelectedRanges"
,
"group"
:
"2_git@2"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
},
{
"command"
:
"git.revertSelectedRanges"
,
"group"
:
"2_git@3"
,
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
}
],
"editor/context"
:
[
{
"command"
:
"git.stageSelectedRanges"
,
"group"
:
"2_git@1"
,
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
},
{
"command"
:
"git.unstageSelectedRanges"
,
"group"
:
"2_git@2"
,
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
},
{
"command"
:
"git.revertSelectedRanges"
,
"group"
:
"2_git@3"
,
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when"
:
"isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git
fs
$|^file$/"
}
],
"scm/change/title"
:
[
{
"command"
:
"git.stageChange"
,
"when"
:
"originalResourceScheme == git"
"when"
:
"originalResourceScheme == git
fs
"
},
{
"command"
:
"git.revertChange"
,
"when"
:
"originalResourceScheme == git"
"when"
:
"originalResourceScheme == git
fs
"
}
]
},
...
...
extensions/git/src/commands.ts
浏览文件 @
e055299e
...
...
@@ -14,7 +14,7 @@ import { CommitOptions, ForcePushMode, Git, Stash } from './git';
import
{
Model
}
from
'
./model
'
;
import
{
Repository
,
Resource
,
ResourceGroupType
}
from
'
./repository
'
;
import
{
applyLineChanges
,
getModifiedRange
,
intersectDiffWithRange
,
invertLineChange
,
toLineRanges
}
from
'
./staging
'
;
import
{
fromGitUri
,
toGitUri
}
from
'
./uri
'
;
import
{
fromGitUri
,
toGitUri
,
isGitUri
}
from
'
./uri
'
;
import
{
grep
,
isDescendant
,
pathEquals
}
from
'
./util
'
;
const
localize
=
nls
.
loadMessageBundle
();
...
...
@@ -692,7 +692,7 @@ export class CommandCenter {
let
uris
:
Uri
[]
|
undefined
;
if
(
arg
instanceof
Uri
)
{
if
(
arg
.
scheme
===
'
git
'
)
{
if
(
isGitUri
(
arg
)
)
{
uris
=
[
Uri
.
file
(
fromGitUri
(
arg
).
path
)];
}
else
if
(
arg
.
scheme
===
'
file
'
)
{
uris
=
[
arg
];
...
...
@@ -1117,7 +1117,7 @@ export class CommandCenter {
const
modifiedDocument
=
textEditor
.
document
;
const
modifiedUri
=
modifiedDocument
.
uri
;
if
(
modifiedUri
.
scheme
!==
'
git
'
)
{
if
(
!
isGitUri
(
modifiedUri
)
)
{
return
;
}
...
...
@@ -2454,7 +2454,7 @@ export class CommandCenter {
return
undefined
;
}
if
(
uri
.
scheme
===
'
git
'
)
{
if
(
isGitUri
(
uri
)
)
{
const
{
path
}
=
fromGitUri
(
uri
);
uri
=
Uri
.
file
(
path
);
}
...
...
extensions/git/src/uri.ts
浏览文件 @
e055299e
...
...
@@ -11,6 +11,10 @@ export interface GitUriParams {
submoduleOf
?:
string
;
}
export
function
isGitUri
(
uri
:
Uri
):
boolean
{
return
/^git
(
fs
)?
$/
.
test
(
uri
.
scheme
);
}
export
function
fromGitUri
(
uri
:
Uri
):
GitUriParams
{
return
JSON
.
parse
(
uri
.
query
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录