Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a3e65ef0
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a3e65ef0
编写于
3月 16, 2017
作者:
G
Gabriel Mazetto
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix GitHub importer for PRs of deleted forked repositories
上级
fee8dcde
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
45 addition
and
4 deletion
+45
-4
lib/gitlab/github_import/branch_formatter.rb
lib/gitlab/github_import/branch_formatter.rb
+4
-0
lib/gitlab/github_import/pull_request_formatter.rb
lib/gitlab/github_import/pull_request_formatter.rb
+16
-4
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+25
-0
未找到文件。
lib/gitlab/github_import/branch_formatter.rb
浏览文件 @
a3e65ef0
...
@@ -11,6 +11,10 @@ module Gitlab
...
@@ -11,6 +11,10 @@ module Gitlab
sha
.
present?
&&
ref
.
present?
sha
.
present?
&&
ref
.
present?
end
end
def
user
raw_data
.
user
.
login
end
private
private
def
branch_exists?
def
branch_exists?
...
...
lib/gitlab/github_import/pull_request_formatter.rb
浏览文件 @
a3e65ef0
module
Gitlab
module
Gitlab
module
GithubImport
module
GithubImport
class
PullRequestFormatter
<
IssuableFormatter
class
PullRequestFormatter
<
IssuableFormatter
delegate
:exists?
,
:project
,
:ref
,
:repo
,
:sha
,
to: :source_branch
,
prefix:
true
delegate
:
user
,
:
exists?
,
:project
,
:ref
,
:repo
,
:sha
,
to: :source_branch
,
prefix:
true
delegate
:exists?
,
:project
,
:ref
,
:repo
,
:sha
,
to: :target_branch
,
prefix:
true
delegate
:
user
,
:
exists?
,
:project
,
:ref
,
:repo
,
:sha
,
to: :target_branch
,
prefix:
true
def
attributes
def
attributes
{
{
...
@@ -39,13 +39,23 @@ module Gitlab
...
@@ -39,13 +39,23 @@ module Gitlab
def
source_branch_name
def
source_branch_name
@source_branch_name
||=
begin
@source_branch_name
||=
begin
if
cross_project?
if
cross_project?
if
source_branch_repo
"pull/
#{
number
}
/
#{
source_branch_repo
.
full_name
}
/
#{
source_branch_ref
}
"
"pull/
#{
number
}
/
#{
source_branch_repo
.
full_name
}
/
#{
source_branch_ref
}
"
else
"pull/
#{
number
}
/
#{
source_branch_user
}
/
#{
source_branch_ref
}
"
end
else
else
source_branch_exists?
?
source_branch_ref
:
"pull/
#{
number
}
/
#{
source_branch_ref
}
"
source_branch_exists?
?
source_branch_ref
:
"pull/
#{
number
}
/
#{
source_branch_ref
}
"
end
end
end
end
end
end
def
source_branch_exists?
return
false
if
cross_project?
source_branch
.
exists?
end
def
target_branch
def
target_branch
@target_branch
||=
BranchFormatter
.
new
(
project
,
raw_data
.
base
)
@target_branch
||=
BranchFormatter
.
new
(
project
,
raw_data
.
base
)
end
end
...
@@ -57,7 +67,9 @@ module Gitlab
...
@@ -57,7 +67,9 @@ module Gitlab
end
end
def
cross_project?
def
cross_project?
source_branch
.
repo
.
id
!=
target_branch
.
repo
.
id
return
true
if
source_branch_repo
.
nil?
source_branch_repo
.
id
!=
target_branch_repo
.
id
end
end
def
opened?
def
opened?
...
...
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
浏览文件 @
a3e65ef0
...
@@ -13,6 +13,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
...
@@ -13,6 +13,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:target_branch
)
{
double
(
ref:
'master'
,
repo:
target_repo
,
sha:
target_sha
)
}
let
(
:target_branch
)
{
double
(
ref:
'master'
,
repo:
target_repo
,
sha:
target_sha
)
}
let
(
:removed_branch
)
{
double
(
ref:
'removed-branch'
,
repo:
source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:removed_branch
)
{
double
(
ref:
'removed-branch'
,
repo:
source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:forked_branch
)
{
double
(
ref:
'master'
,
repo:
forked_source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:forked_branch
)
{
double
(
ref:
'master'
,
repo:
forked_source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:branch_deleted_repo
)
{
double
(
ref:
'master'
,
repo:
nil
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
,
user:
octocat
)
}
let
(
:octocat
)
{
double
(
id:
123456
,
login:
'octocat'
,
email:
'octocat@example.com'
)
}
let
(
:octocat
)
{
double
(
id:
123456
,
login:
'octocat'
,
email:
'octocat@example.com'
)
}
let
(
:created_at
)
{
DateTime
.
strptime
(
'2011-01-26T19:01:12Z'
)
}
let
(
:created_at
)
{
DateTime
.
strptime
(
'2011-01-26T19:01:12Z'
)
}
let
(
:updated_at
)
{
DateTime
.
strptime
(
'2011-01-27T19:01:12Z'
)
}
let
(
:updated_at
)
{
DateTime
.
strptime
(
'2011-01-27T19:01:12Z'
)
}
...
@@ -215,6 +216,14 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
...
@@ -215,6 +216,14 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
expect
(
pull_request
.
source_branch_name
).
to
eq
'pull/1347/company/otherproject/master'
expect
(
pull_request
.
source_branch_name
).
to
eq
'pull/1347/company/otherproject/master'
end
end
end
end
context
'when source branch is from a deleted fork'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
branch_deleted_repo
))
}
it
'prefixes branch name with pull request number and user login to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
'pull/1347/octocat/master'
end
end
end
end
shared_examples
'Gitlab::GithubImport::PullRequestFormatter#target_branch_name'
do
shared_examples
'Gitlab::GithubImport::PullRequestFormatter#target_branch_name'
do
...
@@ -290,6 +299,14 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
...
@@ -290,6 +299,14 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
end
end
end
end
context
'when source repository does not exist anymore'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
branch_deleted_repo
))
}
it
'returns true'
do
expect
(
pull_request
.
cross_project?
).
to
eq
true
end
end
context
'when source and target repositories are the same'
do
context
'when source and target repositories are the same'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
source_branch
))
}
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
source_branch
))
}
...
@@ -299,6 +316,14 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
...
@@ -299,6 +316,14 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
end
end
end
end
describe
'#source_branch_exists?'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
forked_branch
))
}
it
'returns false when is a cross_project'
do
expect
(
pull_request
.
source_branch_exists?
).
to
eq
false
end
end
describe
'#url'
do
describe
'#url'
do
let
(
:raw_data
)
{
double
(
base_data
)
}
let
(
:raw_data
)
{
double
(
base_data
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录