Download as
Browse Code »

Commit ed26ecae0c3303b5554b033abd6f0a078b7573c0

Authored by Robert Speicher
1 parent 0439387b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Add branches method to Repository role

Showing 1 changed file with 9 additions and 11 deletions   Show diff stats
app/roles/repository.rb
  Diff comments   View file @ed26eca
... ... @@ -45,8 +45,16 @@ module Repository
45 45 File.exists?(hook_file)
46 46 end
47 47  
  48 + def branches
  49 + repo.branches.collect(&:name).sort
  50 + end
  51 +
48 52 def tags
49   - repo.tags.map(&:name).sort.reverse
  53 + repo.tags.collect(&:name).sort.reverse
  54 + end
  55 +
  56 + def ref_names
  57 + [branches + tags].flatten
50 58 end
51 59  
52 60 def repo
... ... @@ -79,14 +87,6 @@ module Repository
79 87 @heads ||= repo.heads
80 88 end
81 89  
82   - def branches_names
83   - heads.map(&:name)
84   - end
85   -
86   - def ref_names
87   - [branches_names + tags].flatten
88   - end
89   -
90 90 def tree(fcommit, path = nil)
91 91 fcommit = commit if fcommit == :head
92 92 tree = fcommit.tree
... ... @@ -109,8 +109,6 @@ module Repository
109 109 # - If two or more branches are present, returns the one that has a name
110 110 # matching root_ref (default_branch or 'master' if default_branch is nil)
111 111 def discover_default_branch
112   - branches = heads.collect(&:name)
113   -
114 112 if branches.length == 0
115 113 nil
116 114 elsif branches.length == 1
... ...