Class: Merge::Bases

Inherits:
Object
  • Object
show all
Defined in:
lib/merge/bases.rb

Instance Method Summary collapse

Constructor Details

#initialize(database, one, two) ⇒ Bases

Returns a new instance of Bases.



7
8
9
10
# File 'lib/merge/bases.rb', line 7

def initialize(database, one, two)
  @database = database
  @common   = CommonAncestors.new(@database, one, [two])
end

Instance Method Details

#findObject



12
13
14
15
16
17
18
19
# File 'lib/merge/bases.rb', line 12

def find
  @commits = @common.find
  return @commits if @commits.size <= 1

  @redundant = Set.new
  @commits.each { |commit| filter_commit(commit) }
  @commits - @redundant.to_a
end