summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-03-17 03:48:06 +0100
committerGabriel Mazetto <brodock@gmail.com>2017-04-03 12:45:31 +0200
commit291bd873d38094d9bc9b7482566f6dee40096992 (patch)
treebfb336b445e1a4c56f4610065eebf590b02dc7c0
parent59588ebac012e0bb300d1d7660f5a7360ace5e4e (diff)
downloadgitlab-ce-291bd873d38094d9bc9b7482566f6dee40096992.tar.gz
One more change to the branch names to preserve metadata
-rw-r--r--lib/gitlab/github_import/pull_request_formatter.rb4
-rw-r--r--spec/lib/gitlab/github_import/pull_request_formatter_spec.rb14
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index bc24c6de120..82be1639578 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -47,7 +47,7 @@ module Gitlab
end
def source_branch_name_prefixed
- "gh-#{target_branch_short_sha}/#{number}"
+ "gh-#{target_branch_short_sha}/#{number}/#{source_branch_user}/#{source_branch_ref}"
end
def source_branch_exists?
@@ -67,7 +67,7 @@ module Gitlab
end
def target_branch_name_prefixed
- "gl-#{target_branch_short_sha}/#{number}"
+ "gl-#{target_branch_short_sha}/#{number}/#{target_branch_user}/#{target_branch_ref}"
end
def cross_project?
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index 62a13307dfe..3a4e7bcb903 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -12,9 +12,9 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let(:source_branch) { double(ref: 'branch-merged', repo: source_repo, sha: source_sha) }
let(:forked_source_repo) { double(id: 2, fork: true, name: 'otherproject', full_name: 'company/otherproject') }
let(:target_repo) { repository }
- 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(:forked_branch) { double(ref: 'master', repo: forked_source_repo, sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b') }
+ let(:target_branch) { double(ref: 'master', repo: target_repo, sha: target_sha, user: octocat) }
+ let(:removed_branch) { double(ref: 'removed-branch', repo: source_repo, sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b', user: octocat) }
+ let(:forked_branch) { double(ref: 'master', repo: forked_source_repo, sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b', user: octocat) }
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(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
@@ -207,7 +207,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let(:raw_data) { double(base_data.merge(head: removed_branch)) }
it 'prefixes branch name with to avoid collision' do
- expect(pull_request.source_branch_name).to eq "gh-#{target_short_sha}/1347"
+ expect(pull_request.source_branch_name).to eq "gh-#{target_short_sha}/1347/octocat/removed-branch"
end
end
@@ -215,7 +215,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let(:raw_data) { double(base_data.merge(head: forked_branch)) }
it 'prefixes branch name with to avoid collision' do
- expect(pull_request.source_branch_name).to eq "gh-#{target_short_sha}/1347"
+ expect(pull_request.source_branch_name).to eq "gh-#{target_short_sha}/1347/octocat/master"
end
end
@@ -223,7 +223,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let(:raw_data) { double(base_data.merge(head: branch_deleted_repo)) }
it 'prefixes branch name with to avoid collision' do
- expect(pull_request.source_branch_name).to eq "gh-#{target_short_sha}/1347"
+ expect(pull_request.source_branch_name).to eq "gh-#{target_short_sha}/1347/octocat/master"
end
end
end
@@ -241,7 +241,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let(:raw_data) { double(base_data.merge(base: removed_branch)) }
it 'prefixes branch name with to avoid collision' do
- expect(pull_request.target_branch_name).to eq 'gl-2e5d3239/1347'
+ expect(pull_request.target_branch_name).to eq 'gl-2e5d3239/1347/octocat/removed-branch'
end
end
end