Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bd647b78
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,发现更多精彩内容 >>
提交
bd647b78
编写于
5月 15, 2018
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove unused code
上级
d298248b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
29 deletion
+5
-29
extensions/git-extended/src/common/diff.ts
extensions/git-extended/src/common/diff.ts
+1
-1
extensions/git-extended/src/common/models/protocol.ts
extensions/git-extended/src/common/models/protocol.ts
+1
-7
extensions/git-extended/src/common/models/repository.ts
extensions/git-extended/src/common/models/repository.ts
+0
-14
extensions/git-extended/src/common/pullRequestGitHelper.ts
extensions/git-extended/src/common/pullRequestGitHelper.ts
+3
-7
未找到文件。
extensions/git-extended/src/common/diff.ts
浏览文件 @
bd647b78
...
...
@@ -331,7 +331,7 @@ export function mapCommentsToHead(prPatch: string, localDiff: string, comments:
for
(
let
i
=
0
;
i
<
comments
.
length
;
i
++
)
{
let
comment
=
comments
[
i
];
let
diffLine
=
getDiffLineByPosition
(
prPatch
,
comment
.
position
);
let
diffLine
=
getDiffLineByPosition
(
prPatch
,
comment
.
position
|
comment
.
original_position
);
let
positionInPr
=
diffLine
.
newLineNumber
;
let
newPosition
=
mapOldPositionToNew
(
localDiff
,
positionInPr
);
comment
.
absolutePosition
=
newPosition
;
...
...
extensions/git-extended/src/common/models/protocol.ts
浏览文件 @
bd647b78
...
...
@@ -33,12 +33,6 @@ export class Protocol {
return
this
.
owner
?
`
${
this
.
owner
}
/
${
this
.
repositoryName
}
`
:
this
.
repositoryName
;
}
public
isFileUri
:
boolean
;
public
isScpUri
:
boolean
;
public
isValidUri
:
boolean
;
public
readonly
url
:
vscode
.
Uri
;
constructor
(
uriString
:
string
...
...
@@ -116,7 +110,7 @@ export class Protocol {
return
null
;
}
if
(
this
.
isFileUri
)
{
if
(
this
.
type
===
ProtocolType
.
Local
)
{
return
this
.
url
;
}
...
...
extensions/git-extended/src/common/models/repository.ts
浏览文件 @
bd647b78
...
...
@@ -60,12 +60,6 @@ export class Repository {
return
this
.
_remotes
;
}
// todo
private
_cloneUrl
:
Protocol
;
get
cloneUrl
():
Protocol
{
return
this
.
_cloneUrl
;
}
private
statusTimeout
:
any
;
private
disposables
:
vscode
.
Disposable
[]
=
[];
...
...
@@ -112,14 +106,6 @@ export class Repository {
this
.
_HEAD
=
HEAD
;
this
.
_refs
=
refs
;
this
.
_remotes
=
remotes
;
if
(
this
.
_HEAD
.
upstream
&&
this
.
_HEAD
.
upstream
.
remote
)
{
let
currentRemote
=
this
.
_remotes
.
filter
(
remote
=>
remote
.
remoteName
===
this
.
_HEAD
.
upstream
.
remote
);
if
(
currentRemote
&&
currentRemote
.
length
)
{
this
.
_cloneUrl
=
new
Protocol
(
currentRemote
[
0
].
url
);
}
}
this
.
_onDidRunGitStatus
.
fire
();
}
...
...
extensions/git-extended/src/common/pullRequestGitHelper.ts
浏览文件 @
bd647b78
...
...
@@ -18,11 +18,7 @@ export class PullRequestGitHelper {
let
existing
=
await
repository
.
getBranch
(
localBranchName
);
if
(
existing
)
{
// already exist
await
repository
.
checkout
(
localBranchName
);
}
else
if
(
repository
.
cloneUrl
.
equals
(
pullRequest
.
head
.
repositoryCloneUrl
))
{
// branch from the same repository
await
repository
.
fetch
(
'
origin
'
,
localBranchName
);
// already exist but the metadata is missing.
await
repository
.
checkout
(
localBranchName
);
}
else
{
// the branch is from a fork
...
...
@@ -36,8 +32,8 @@ export class PullRequestGitHelper {
await
repository
.
setTrackingBranch
(
localBranchName
,
`refs/remotes/
${
remoteName
}
/
${
pullRequest
.
head
.
ref
}
`
);
}
let
pr
Config
Key
=
`branch.
${
localBranchName
}
.
${
PullRequestMetadataKey
}
`
;
await
repository
.
setConfig
(
pr
Config
Key
,
PullRequestGitHelper
.
buildPullRequestMetadata
(
pullRequest
));
let
pr
BranchMetadata
Key
=
`branch.
${
localBranchName
}
.
${
PullRequestMetadataKey
}
`
;
await
repository
.
setConfig
(
pr
BranchMetadata
Key
,
PullRequestGitHelper
.
buildPullRequestMetadata
(
pullRequest
));
}
static
async
checkout
(
repository
:
Repository
,
remote
:
Remote
,
branchName
:
string
,
pullRequest
:
PullRequestModel
):
Promise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录