diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-09-01 12:01:50 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-01 12:01:50 +0000 |
| commit | 0187018e482f842704aa2cdc2f81375c859ec824 (patch) | |
| tree | b91b3e0ce3fe763d09ea3ead63392b212936ef42 | |
| parent | 7d3e888d069c3035b25f0dc8ff5efc8e52063db9 (diff) | |
| download | gitlab-ce-0187018e482f842704aa2cdc2f81375c859ec824.tar.gz | |
Simplify Git interactions in AfterImportService
| -rw-r--r-- | app/services/projects/after_import_service.rb | 9 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/app/services/projects/after_import_service.rb b/app/services/projects/after_import_service.rb index e6a68d983ef..3047268b2d1 100644 --- a/app/services/projects/after_import_service.rb +++ b/app/services/projects/after_import_service.rb @@ -1,7 +1,6 @@ module Projects class AfterImportService - RESERVED_REFS_REGEXP = - %r{\Arefs/(?:#{Regexp.union(*Repository::RESERVED_REFS_NAMES)})/} + RESERVED_REF_PREFIXES = Repository::RESERVED_REFS_NAMES.map { |n| File.join('refs', n, '/') } def initialize(project) @project = project @@ -9,7 +8,7 @@ module Projects def execute Projects::HousekeepingService.new(@project).execute do - repository.delete_refs(*garbage_refs) + repository.delete_all_refs_except(RESERVED_REF_PREFIXES) end rescue Projects::HousekeepingService::LeaseTaken => e Rails.logger.info( @@ -18,10 +17,6 @@ module Projects private - def garbage_refs - @garbage_refs ||= repository.all_ref_names_except(RESERVED_REFS_REGEXP) - end - def repository @repository ||= @project.repository end diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 554e40dc8a6..8709f82bcc4 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -250,11 +250,17 @@ module Gitlab branch_names + tag_names end + def delete_all_refs_except(prefixes) + delete_refs(*all_ref_names_except(prefixes)) + end + # Returns an Array of all ref names, except when it's matching pattern # # regexp - The pattern for ref names we don't want - def all_ref_names_except(regexp) - rugged.references.reject { |ref| ref.name =~ regexp }.map(&:name) + def all_ref_names_except(prefixes) + rugged.references.reject do |ref| + prefixes.any? { |p| ref.name.start_with?(p) } + end.map(&:name) end # Discovers the default branch based on the repository's available branches |