class Eternity::Patch::Merge

Public Instance Methods

merged?() click to toggle source
# File lib/eternity/patch.rb, line 94
def merged?
  @merged ||= current_commit == target_commit ||
              target_commit.fast_forward?(current_commit) || 
              current_commit.fast_forward?(target_commit)
end

Private Instance Methods

calculate_delta() click to toggle source
Calls superclass method Eternity::Patch::Common#calculate_delta
# File lib/eternity/patch.rb, line 102
def calculate_delta
  return {} if merged?
  super
end
merge_deltas(target_delta, revert_delta, base_index) click to toggle source
# File lib/eternity/patch.rb, line 107
def merge_deltas(target_delta, revert_delta, base_index)
  remaining_delta = Delta.merge remaining_history.reverse.map(&:delta)
  Delta.merge [revert_delta, target_delta, remaining_delta], base_index
end