From ceff0c91700b15ecf26931c23f40637dcdf7204d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 2 Aug 2016 13:41:22 -0300
Subject: [PATCH] Check out locally PRs where the source/target branch were
removed
---
lib/gitlab/github_import/importer.rb | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 3932fcb1eda..3b501533ffb 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -71,11 +71,12 @@ module Gitlab
pull_requests = client.pull_requests(repo, state: :all, sort: :created, direction: :asc, per_page: 100)
pull_requests = pull_requests.map { |raw| PullRequestFormatter.new(project, raw) }.select(&:valid?)
- source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch_name, pr.source_branch_sha] }
+ source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch_name, pr.number] }
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
- restore_branches(branches_removed)
+ restore_source_branches(source_branches_removed)
+ restore_target_branches(target_branches_removed)
pull_requests.each do |pull_request|
merge_request = pull_request.create!
@@ -120,17 +121,20 @@ module Gitlab
end
end
- def restore_branches(branches)
- branches.each do |name, sha|
- client.create_ref(repo, "refs/heads/#{name}", sha)
+ def restore_source_branches(branches)
+ branches.each do |name, number|
+ project.repository.fetch_ref(repo_url, "pull/#{number}/head", name)
end
+ end
- project.repository.fetch_ref(repo_url, '+refs/heads/*', 'refs/heads/*')
+ def restore_target_branches(branches)
+ branches.each do |name, sha|
+ project.repository.create_branch(name, sha)
+ end
end
def clean_up_restored_branches(branches)
branches.each do |name, _|
- client.delete_ref(repo, "heads/#{name}")
project.repository.delete_branch(name) rescue Rugged::ReferenceError
end
--
GitLab