Extract GitHub branch formatter

1 files changed, 14 insertions, 16 deletions

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 9aea947a812..1f160837c5d 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -6,8 +6,8 @@ module Gitlab
       attr_reader :client, :project, :repo, :repo_url
 
       def initialize(project)
-        @project = project
-        @repo = project.import_source
+        @project  = project
+        @repo     = project.import_source
         @repo_url = project.import_url
 
         if credentials
@@ -30,7 +30,7 @@ module Gitlab
       end
 
       def import_labels
-        client.labels(project.import_source).each do |raw_data|
+        client.labels(repo).each do |raw_data|
           Label.create!(LabelFormatter.new(project, raw_data).attributes)
         end
 
@@ -40,7 +40,7 @@ module Gitlab
       end
 
       def import_milestones
-        client.list_milestones(project.import_source, state: :all).each do |raw_data|
+        client.list_milestones(repo, state: :all).each do |raw_data|
           Milestone.create!(MilestoneFormatter.new(project, raw_data).attributes)
         end
 
@@ -50,9 +50,7 @@ module Gitlab
       end
 
       def import_issues
-        client.list_issues(project.import_source, state: :all,
-                                                  sort: :created,
-                                                  direction: :asc).each do |raw_data|
+        client.list_issues(repo, state: :all, sort: :created, direction: :asc).each do |raw_data|
           gh_issue = IssueFormatter.new(project, raw_data)
 
           if gh_issue.valid?
@@ -75,8 +73,8 @@ module Gitlab
                               .map { |raw| PullRequestFormatter.new(project, raw) }
                               .select(&:valid?)
 
-        source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch, pr.source_sha] }
-        target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch, pr.target_sha] }
+        source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch_name, pr.source_branch_sha] }
+        target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch_name, pr.target_branch_sha] }
         branches_removed = source_branches_removed | target_branches_removed
 
         create_refs(branches_removed)
@@ -101,19 +99,19 @@ module Gitlab
       end
 
       def create_refs(branches)
-        branches.each do |branch|
-          client.create_ref(repo, "refs/heads/#{branch.first}", branch.last)
+        branches.each do |name, sha|
+          client.create_ref(repo, "refs/heads/#{name}", sha)
         end
       end
 
       def delete_refs(branches)
-        branches.each do |branch|
-          client.delete_ref(repo, "heads/#{branch.first}")
+        branches.each do |name, _|
+          client.delete_ref(repo, "heads/#{name}")
         end
       end
 
       def apply_labels(number, issuable)
-        issue = client.issue(project.import_source, number)
+        issue = client.issue(repo, number)
 
         if issue.labels.count > 0
           label_ids = issue.labels.map do |raw|
@@ -125,12 +123,12 @@ module Gitlab
       end
 
       def import_comments(issue_number, noteable)
-        comments = client.issue_comments(project.import_source, issue_number)
+        comments = client.issue_comments(repo, issue_number)
         create_comments(comments, noteable)
       end
 
       def import_comments_on_diff(pull_request_number, merge_request)
-        comments = client.pull_request_comments(project.import_source, pull_request_number)
+        comments = client.pull_request_comments(repo, pull_request_number)
         create_comments(comments, merge_request)
       end