Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
59588eba
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,发现更多精彩内容 >>
提交
59588eba
编写于
3月 16, 2017
作者:
D
Douglas Barbosa Alexandre
提交者:
Gabriel Mazetto
4月 03, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prefixes source branch name with short SHA to avoid collision
上级
a3e65ef0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
18 deletion
+28
-18
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
+13
-9
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+11
-9
未找到文件。
lib/gitlab/github_import/branch_formatter.rb
浏览文件 @
59588eba
...
...
@@ -15,6 +15,10 @@ module Gitlab
raw_data
.
user
.
login
end
def
short_sha
(
length
=
7
)
sha
.
to_s
[
0
..
length
]
end
private
def
branch_exists?
...
...
lib/gitlab/github_import/pull_request_formatter.rb
浏览文件 @
59588eba
module
Gitlab
module
GithubImport
class
PullRequestFormatter
<
IssuableFormatter
delegate
:user
,
:
exists?
,
:
project
,
:ref
,
:repo
,
:sha
,
to: :source_branch
,
prefix:
true
delegate
:user
,
:exists?
,
:project
,
:ref
,
:repo
,
:sha
,
to: :target_branch
,
prefix:
true
delegate
:user
,
:project
,
:ref
,
:repo
,
:sha
,
to: :source_branch
,
prefix:
true
delegate
:user
,
:exists?
,
:project
,
:ref
,
:repo
,
:sha
,
:short_sha
,
to: :target_branch
,
prefix:
true
def
attributes
{
...
...
@@ -39,17 +39,17 @@ module Gitlab
def
source_branch_name
@source_branch_name
||=
begin
if
cross_project?
if
source_branch_repo
"pull/
#{
number
}
/
#{
source_branch_repo
.
full_name
}
/
#{
source_branch_ref
}
"
else
"pull/
#{
number
}
/
#{
source_branch_user
}
/
#{
source_branch_ref
}
"
end
source_branch_name_prefixed
else
source_branch_exists?
?
source_branch_ref
:
"pull/
#{
number
}
/
#{
source_branch_ref
}
"
source_branch_exists?
?
source_branch_ref
:
source_branch_name_prefixed
end
end
end
def
source_branch_name_prefixed
"gh-
#{
target_branch_short_sha
}
/
#{
number
}
"
end
def
source_branch_exists?
return
false
if
cross_project?
...
...
@@ -62,10 +62,14 @@ module Gitlab
def
target_branch_name
@target_branch_name
||=
begin
target_branch_exists?
?
target_branch_ref
:
"pull/
#{
number
}
/
#{
target_branch_ref
}
"
target_branch_exists?
?
target_branch_ref
:
target_branch_name_prefixed
end
end
def
target_branch_name_prefixed
"gl-
#{
target_branch_short_sha
}
/
#{
number
}
"
end
def
cross_project?
return
true
if
source_branch_repo
.
nil?
...
...
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
浏览文件 @
59588eba
...
...
@@ -4,7 +4,9 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:client
)
{
double
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:source_sha
)
{
create
(
:commit
,
project:
project
).
id
}
let
(
:target_sha
)
{
create
(
:commit
,
project:
project
,
git_commit:
RepoHelpers
.
another_sample_commit
).
id
}
let
(
:target_commit
)
{
create
(
:commit
,
project:
project
,
git_commit:
RepoHelpers
.
another_sample_commit
)
}
let
(
:target_sha
)
{
target_commit
.
id
}
let
(
:target_short_sha
)
{
target_commit
.
id
.
to_s
[
0
..
7
]
}
let
(
:repository
)
{
double
(
id:
1
,
fork:
false
)
}
let
(
:source_repo
)
{
repository
}
let
(
:source_branch
)
{
double
(
ref:
'branch-merged'
,
repo:
source_repo
,
sha:
source_sha
)
}
...
...
@@ -204,24 +206,24 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
context
'when source branch does not exist'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
removed_branch
))
}
it
'prefixes branch name with
pull request number
'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
'pull/1347/removed-branch'
it
'prefixes branch name with
to avoid collision
'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347"
end
end
context
'when source branch is from a fork'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
forked_branch
))
}
it
'prefixes branch name with
pull request number and project with namespace
to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
'pull/1347/company/otherproject/master'
it
'prefixes branch name with to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347"
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'
it
'prefixes branch name with to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347"
end
end
end
...
...
@@ -238,8 +240,8 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
context
'when target branch does not exist'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
base:
removed_branch
))
}
it
'prefixes branch name with
pull request number
'
do
expect
(
pull_request
.
target_branch_name
).
to
eq
'
pull/1347/removed-branch
'
it
'prefixes branch name with
to avoid collision
'
do
expect
(
pull_request
.
target_branch_name
).
to
eq
'
gl-2e5d3239/1347
'
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录