Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b65bf5ce
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,发现更多精彩内容 >>
提交
b65bf5ce
编写于
5月 23, 2018
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
show commit id in the file path for comments outdated
上级
0ae17e63
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
13 deletion
+13
-13
extensions/git-extended/src/common/uri.ts
extensions/git-extended/src/common/uri.ts
+2
-2
extensions/git-extended/src/review/gitContentProvider.ts
extensions/git-extended/src/review/gitContentProvider.ts
+1
-0
extensions/git-extended/src/review/reviewManager.ts
extensions/git-extended/src/review/reviewManager.ts
+10
-11
未找到文件。
extensions/git-extended/src/common/uri.ts
浏览文件 @
b65bf5ce
...
...
@@ -25,9 +25,9 @@ export interface GitUriOptions {
// As a mitigation for extensions like ESLint showing warnings and errors
// for git URIs, let's change the file extension of these uris to .git,
// when `replaceFileExtension` is true.
export
function
toGitUri
(
uri
:
Uri
,
ref
:
string
,
commit
:
string
,
options
:
GitUriOptions
=
{}):
Uri
{
export
function
toGitUri
(
uri
:
Uri
,
filePath
:
string
,
ref
:
string
,
commit
:
string
,
options
:
GitUriOptions
=
{}):
Uri
{
const
params
:
GitUriParams
=
{
path
:
uri
.
path
,
path
:
filePath
?
filePath
:
uri
.
path
,
ref
,
commit
:
commit
};
...
...
extensions/git-extended/src/review/gitContentProvider.ts
浏览文件 @
b65bf5ce
...
...
@@ -7,6 +7,7 @@
import
*
as
vscode
from
'
vscode
'
;
import
{
Repository
}
from
'
../models/repository
'
;
import
{
fromGitUri
}
from
'
../common/uri
'
;
import
{
PullRequestModel
}
from
'
../models/pullRequestModel
'
;
export
class
GitContentProvider
implements
vscode
.
TextDocumentContentProvider
{
private
_onDidChange
=
new
vscode
.
EventEmitter
<
vscode
.
Uri
>
();
...
...
extensions/git-extended/src/review/reviewManager.ts
浏览文件 @
b65bf5ce
...
...
@@ -238,13 +238,12 @@ export class ReviewManager implements vscode.DecorationProvider {
if
(
pr
.
prItem
.
head
.
sha
!==
this
.
_lastCommitSha
&&
!
this
.
_updateMessageShown
)
{
this
.
_updateMessageShown
=
true
;
await
vscode
.
window
.
showInformationMessage
(
'
There are updates available for this branch.
'
,
{},
'
Pull
'
).
then
(
result
=>
{
if
(
result
===
'
Pull
'
)
{
vscode
.
commands
.
executeCommand
(
'
git.pull
'
).
then
(()
=>
{
this
.
_updateMessageShown
=
false
;
});
}
});
let
result
=
await
vscode
.
window
.
showInformationMessage
(
'
There are updates available for this branch.
'
,
{},
'
Pull
'
);
if
(
result
===
'
Pull
'
)
{
await
vscode
.
commands
.
executeCommand
(
'
git.pull
'
);
this
.
_updateMessageShown
=
false
;
}
}
const
comments
=
await
pr
.
getComments
();
...
...
@@ -328,8 +327,8 @@ export class ReviewManager implements vscode.DecorationProvider {
change
.
status
,
change
.
fileName
,
change
.
blobUrl
,
toGitUri
(
vscode
.
Uri
.
parse
(
change
.
fileName
),
null
,
change
.
status
===
GitChangeType
.
DELETE
?
''
:
pr
.
prItem
.
head
.
sha
,
{}),
toGitUri
(
vscode
.
Uri
.
parse
(
change
.
fileName
),
null
,
change
.
status
===
GitChangeType
.
ADD
?
''
:
pr
.
prItem
.
base
.
sha
,
{}),
toGitUri
(
vscode
.
Uri
.
parse
(
change
.
fileName
),
null
,
null
,
change
.
status
===
GitChangeType
.
DELETE
?
''
:
pr
.
prItem
.
head
.
sha
,
{}),
toGitUri
(
vscode
.
Uri
.
parse
(
change
.
fileName
),
null
,
null
,
change
.
status
===
GitChangeType
.
ADD
?
''
:
pr
.
prItem
.
base
.
sha
,
{}),
this
.
_repository
.
path
,
change
.
diffHunks
);
...
...
@@ -350,8 +349,8 @@ export class ReviewManager implements vscode.DecorationProvider {
GitChangeType
.
MODIFY
,
fileName
,
null
,
toGitUri
(
vscode
.
Uri
.
parse
(
fileName
)
,
null
,
oldComments
[
0
].
original_commit_id
,
{}),
toGitUri
(
vscode
.
Uri
.
parse
(
fileName
)
,
null
,
oldComments
[
0
].
original_commit_id
,
{}),
toGitUri
(
vscode
.
Uri
.
parse
(
path
.
join
(
`commit~
${
commit
.
substr
(
0
,
8
)}
`
,
fileName
)),
fileName
,
null
,
oldComments
[
0
].
original_commit_id
,
{}),
toGitUri
(
vscode
.
Uri
.
parse
(
path
.
join
(
`commit~
${
commit
.
substr
(
0
,
8
)}
`
,
fileName
)),
fileName
,
null
,
oldComments
[
0
].
original_commit_id
,
{}),
this
.
_repository
.
path
,
[]
// @todo Peng.
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录