kintsugi 0.5.2 → 0.6.0

data/lib/kintsugi/apply_change_to_project.rb

@@ -6,8 +6,21 @@ require "xcodeproj"
 
 require_relative "utils"
 require_relative "error"
+require_relative "settings"
 require_relative "xcodeproj_extensions"
 
+class Array
+  # Converts an array of arrays of size 2 into a multimap, mapping the first element of each
+  # subarray to an array of the last elements it appears with in the same subarray.
+  def to_multi_h
+    raise ArgumentError, "Not all elements are arrays of size 2" unless all? do |arr|
+      arr.is_a?(Array) && arr.count == 2
+    end
+
+    group_by(&:first).transform_values { |group| group.map(&:last) }
+  end
+end
+
 module Kintsugi
   class << self
     # Applies the change specified by `change` to `project`.
@@ -28,27 +41,172 @@ module Kintsugi
         if project.root_object.main_group.nil?
           puts "Warning: Main group doesn't exist, ignoring changes to it."
         else
-          apply_change_to_component(project.root_object, "mainGroup",
-                                    change["rootObject"]["mainGroup"])
+          apply_main_group_change(project, change["rootObject"]["mainGroup"])
         end
       end
 
       unless change["rootObject"]["projectReferences"].nil?
         apply_change_to_component(project.root_object, "projectReferences",
-                                  change["rootObject"]["projectReferences"])
+                                  change["rootObject"]["projectReferences"], "rootObject")
       end
 
       apply_change_to_component(project, "rootObject",
                                 change["rootObject"].reject { |key|
                                   %w[mainGroup projectReferences].include?(key)
-                                })
+                                }, "")
     end
 
     private
 
-    def apply_change_to_component(parent_component, change_name, change)
+    def apply_main_group_change(project, main_group_change)
+      additions, removals, diffs = classify_group_and_file_changes(main_group_change, "")
+      apply_group_additions(project, additions)
+      apply_file_changes(project, additions, removals)
+      apply_group_and_file_diffs(project, diffs)
+      apply_group_removals(project, removals)
+    end
+
+    def classify_group_and_file_changes(change, path)
+      children_changes = change["children"] || {}
+      removals = flatten_change(children_changes[:removed], path)
+      additions = flatten_change(children_changes[:added], path)
+      diffs = [[change, path]]
+      subchanges_of_change(children_changes).each do |key, subchange|
+        sub_additions, sub_removals, sub_diffs =
+          classify_group_and_file_changes(subchange, join_path(path, key))
+        removals += sub_removals
+        additions += sub_additions
+        diffs += sub_diffs
+      end
+
+      [additions, removals, diffs]
+    end
+
+    def flatten_change(change, path)
+      entries = (change || []).map do |child|
+        [child, path]
+      end
+      group_entries = entries.map do |group, _|
+        next if group["children"].nil?
+
+        flatten_change(group["children"], join_path(path, group["displayName"]))
+      end.compact.flatten(1)
+      entries + group_entries
+    end
+
+    def apply_group_additions(project, additions)
+      additions.each do |change, path|
+        next unless %w[PBXGroup PBXVariantGroup].include?(change["isa"])
+
+        group_type = Module.const_get("Xcodeproj::Project::#{change["isa"]}")
+        containing_group = path.empty? ? project.main_group : project[path]
+
+        next if !Settings.allow_duplicates &&
+          !find_group_in_group(containing_group, group_type, change).nil?
+
+        new_group = project.new(group_type)
+        containing_group.children << new_group
+        add_attributes_to_component(new_group, change, path, ignore_keys: ["children"])
+      end
+    end
+
+    def find_group_in_group(group, instance_type, change)
+      group
+        .children
+        .select { |child| child.instance_of?(instance_type) }
+        .find do |child_group|
+          child_group.display_name == change["displayName"] && child_group.path == change["path"]
+        end
+    end
+
+    def apply_file_changes(project, additions, removals)
+      def file_reference_key(change)
+        [change["name"], change["path"], change["sourceTree"]]
+      end
+
+      file_additions = additions.select { |change, _| change["isa"] == "PBXFileReference" }
+      file_removals = removals.select { |change, _| change["isa"] == "PBXFileReference" }
+
+      addition_keys_to_paths = file_additions
+                               .map { |change, path| [file_reference_key(change), path] }
+                               .to_multi_h
+      removal_keys_to_references = file_removals.to_multi_h.map do |change, paths|
+        references = paths.map do |containing_path|
+          project[join_path(containing_path, change["displayName"])]
+        end
+
+        [file_reference_key(change), references]
+      end.to_h
+
+      file_additions.each do |change, path|
+        containing_group = path.empty? ? project.main_group : project[path]
+        change_key = file_reference_key(change)
+
+        if (removal_keys_to_references[change_key] || []).empty?
+          apply_file_addition(containing_group, change, "rootObject/mainGroup/#{path}")
+        elsif addition_keys_to_paths[change_key].length == 1 &&
+            removal_keys_to_references[change_key].length == 1 &&
+            !removal_keys_to_references[change_key].first.nil?
+          removal_keys_to_references[change_key].first.move(containing_group)
+        else
+          file_path = join_path(path, change["displayName"])
+          raise MergeError,
+                "Cannot deduce whether the file #{file_path} is new, or was moved to its new place"
+        end
+      end
+
+      file_removals.each do |change, path|
+        next unless addition_keys_to_paths[file_reference_key(change)].nil?
+
+        file_reference = project[join_path(path, change["displayName"])]
+        remove_component(file_reference, change)
+      end
+    end
+
+    def apply_file_addition(containing_group, change, path)
+      return if !Settings.allow_duplicates &&
+        !find_file_in_group(containing_group, Xcodeproj::Project::PBXFileReference,
+                            change["path"]).nil?
+
+      file_reference = containing_group.project.new(Xcodeproj::Project::PBXFileReference)
+      containing_group.children << file_reference
+
+      # For some reason, `include_in_index` is set to `1` and `source_tree` to `SDKROOT` by
+      # default.
+      file_reference.include_in_index = nil
+      file_reference.source_tree = nil
+      add_attributes_to_component(file_reference, change, path)
+    end
+
+    def apply_group_and_file_diffs(project, diffs)
+      diffs.each do |change, path|
+        component = project[path]
+
+        next if component.nil?
+
+        change.each do |subchange_name, subchange|
+          next if subchange_name == "children"
+
+          apply_change_to_component(component, subchange_name, subchange, path)
+        end
+      end
+    end
+
+    def apply_group_removals(project, removals)
+      removals.each do |change, path|
+        next unless %w[PBXGroup PBXVariantGroup].include?(change["isa"])
+
+        group_path = join_path(path, change["displayName"])
+
+        remove_component(project[group_path], change)
+      end
+    end
+
+    def apply_change_to_component(parent_component, change_name, change, parent_change_path)
       return if change_name == "displayName"
 
+      change_path = join_path(parent_change_path, change_name)
+
       attribute_name = attribute_name_from_change_name(change_name)
       if simple_attribute?(parent_component, attribute_name)
         apply_change_to_simple_attribute(parent_component, attribute_name, change)
@@ -59,28 +217,41 @@ module Kintsugi
         component = replace_component_with_new_type(parent_component, attribute_name, change)
         change = change_for_component_of_new_type(component, change)
       else
-        component = child_component(parent_component, change_name)
-
-        if component.nil?
-          add_missing_component_if_valid(parent_component, change_name, change)
-          return
-        end
+        component = child_component(parent_component, change, change_name)
       end
 
-      (change[:removed] || []).each do |removed_change|
-        child = child_component(component, removed_change["displayName"])
-        next if child.nil?
-
-        remove_component(child, removed_change)
+      if change[:removed].is_a?(Hash)
+        remove_component(component, change[:removed])
+      elsif change[:removed].is_a?(Array)
+        unless component.nil?
+          (change[:removed]).each do |removed_change|
+            child = child_component_of_object_list(component, removed_change,
+                                                   removed_change["displayName"])
+            remove_component(child, removed_change)
+          end
+        end
+      elsif !change[:removed].nil?
+        raise MergeError, "Unsupported removed change type for #{change[:removed]}"
       end
 
-      (change[:added] || []).each do |added_change|
-        is_object_list = component.is_a?(Xcodeproj::Project::ObjectList)
-        add_child_to_component(is_object_list ? parent_component : component, added_change)
+      if change[:added].is_a?(Hash)
+        add_child_to_component(parent_component, change[:added], change_path)
+      elsif change[:added].is_a?(Array)
+        (change[:added]).each do |added_change|
+          add_child_to_component(parent_component, added_change, change_path)
+        end
+      elsif !change[:added].nil?
+        raise MergeError, "Unsupported added change type for #{change[:added]}"
       end
 
       subchanges_of_change(change).each do |subchange_name, subchange|
-        apply_change_to_component(component, subchange_name, subchange)
+        if component.nil?
+          raise MergeError, "Trying to apply changes to a component that doesn't exist at path " \
+            "#{change_path}. It was probably removed in a previous commit. This is considered a " \
+            "conflict that should be resolved manually."
+        end
+
+        apply_change_to_component(component, subchange_name, subchange, change_path)
       end
     end
 
@@ -100,22 +271,9 @@ module Kintsugi
       end
     end
 
-    def add_missing_component_if_valid(parent_component, change_name, change)
-      if change[:added] && change.compact.count == 1
-        add_child_to_component(parent_component, change[:added])
-        return
-      end
-
-      puts "Warning: Detected change of an object named '#{change_name}' contained in " \
-        "'#{parent_component}' but the object doesn't exist. Ignoring this change."
-    end
-
     def replace_component_with_new_type(parent_component, name_in_parent_component, change)
       old_component = parent_component.send(name_in_parent_component)
-
-      new_component = parent_component.project.new(
-        Module.const_get("Xcodeproj::Project::#{change["isa"][:added]}")
-      )
+      new_component = component_of_new_type(parent_component, change, old_component)
 
       copy_attributes_to_new_component(old_component, new_component)
 
@@ -123,6 +281,27 @@ module Kintsugi
       new_component
     end
 
+    def component_of_new_type(parent_component, change, old_component)
+      if change["isa"][:added] == "PBXFileReference"
+        path = (change["path"] && change["path"][:added]) || old_component.path
+        case parent_component
+        when Xcodeproj::Project::XCBuildConfiguration
+          parent_component.base_configuration_reference = find_file(parent_component.project, path)
+          return parent_component.base_configuration_reference
+        when Xcodeproj::Project::PBXNativeTarget
+          parent_component.product_reference = find_file(parent_component.project, path)
+          return parent_component.product_reference
+        when Xcodeproj::Project::PBXBuildFile
+          parent_component.file_ref = find_file(parent_component.project, path)
+          return parent_component.file_ref
+        end
+      end
+
+      parent_component.project.new(
+        Module.const_get("Xcodeproj::Project::#{change["isa"][:added]}")
+      )
+    end
+
     def copy_attributes_to_new_component(old_component, new_component)
       # The change won't describe the attributes that haven't changed, therefore the attributes
       # are copied to the new component.
@@ -143,15 +322,23 @@ module Kintsugi
       end
     end
 
-    def child_component(component, change_name)
+    def child_component(component, change, change_name)
       if component.is_a?(Xcodeproj::Project::ObjectList)
-        component.find { |child| child.display_name == change_name }
+        child_component_of_object_list(component, change, change_name)
       else
         attribute_name = attribute_name_from_change_name(change_name)
         component.send(attribute_name)
       end
     end
 
+    def child_component_of_object_list(component, change, change_name)
+      if change["isa"] == "PBXReferenceProxy"
+        find_reference_proxy_in_component(component, change["remoteRef"])
+      else
+        component.find { |child| child.display_name == change_name }
+      end
+    end
+
     def simple_attribute?(component, attribute_name)
       return false unless component.respond_to?("simple_attributes")
 
@@ -260,7 +447,14 @@ module Kintsugi
 
       return added_change if ((old_value || []) - (removed_change || [])).empty?
 
-      (old_value || []) + (added_change || []) - (removed_change || [])
+      new_value = (old_value || []) - (removed_change || [])
+      filtered_added_change = if Settings.allow_duplicates
+                                (added_change || [])
+                              else
+                                (added_change || []).reject { |added| new_value.include?(added) }
+                              end
+
+      new_value + filtered_added_change
     end
 
     def new_string_simple_attribute_value(old_value, removed_change, added_change)
@@ -273,10 +467,13 @@ module Kintsugi
     end
 
     def remove_component(component, change)
+      return if component.nil?
+
       if component.to_tree_hash != change
         raise MergeError, "Trying to remove an object that changed since then. This is " \
           "considered a conflict that should be resolved manually. Name of the object is: " \
-          "'#{component.display_name}'"
+          "'#{component.display_name}'. Existing component: #{component.to_tree_hash}. " \
+          "Change: #{change}"
       end
 
       if change["isa"] == "PBXFileReference"
@@ -298,63 +495,65 @@ module Kintsugi
       end
     end
 
-    def add_child_to_component(component, change)
+    def add_child_to_component(component, change, component_change_path)
+      change_path = join_path(component_change_path, change["displayName"])
+
       if change["ProjectRef"] && change["ProductGroup"]
-        add_subproject_reference(component, change)
+        add_subproject_reference(component, change, change_path)
         return
       end
 
       case change["isa"]
       when "PBXNativeTarget"
-        add_target(component, change)
+        add_target(component, change, change_path)
       when "PBXAggregateTarget"
-        add_aggregate_target(component, change)
+        add_aggregate_target(component, change, change_path)
       when "PBXFileReference"
-        add_file_reference(component, change)
+        add_file_reference(component, change, change_path)
       when "PBXGroup"
-        add_group(component, change)
+        add_group(component, change, change_path)
       when "PBXContainerItemProxy"
-        add_container_item_proxy(component, change)
+        add_container_item_proxy(component, change, change_path)
       when "PBXTargetDependency"
-        add_target_dependency(component, change)
+        add_target_dependency(component, change, change_path)
       when "PBXBuildFile"
-        add_build_file(component, change)
+        add_build_file(component, change, change_path)
       when "XCConfigurationList"
-        add_build_configuration_list(component, change)
+        add_build_configuration_list(component, change, change_path)
       when "XCBuildConfiguration"
-        add_build_configuration(component, change)
+        add_build_configuration(component, change, change_path)
       when "PBXHeadersBuildPhase"
-        add_headers_build_phase(component, change)
+        add_headers_build_phase(component, change, change_path)
       when "PBXSourcesBuildPhase"
-        add_sources_build_phase(component, change)
+        add_sources_build_phase(component, change, change_path)
       when "PBXCopyFilesBuildPhase"
-        add_copy_files_build_phase(component, change)
+        add_copy_files_build_phase(component, change, change_path)
       when "PBXShellScriptBuildPhase"
-        add_shell_script_build_phase(component, change)
+        add_shell_script_build_phase(component, change, change_path)
       when "PBXFrameworksBuildPhase"
-        add_frameworks_build_phase(component, change)
+        add_frameworks_build_phase(component, change, change_path)
       when "PBXResourcesBuildPhase"
-        add_resources_build_phase(component, change)
+        add_resources_build_phase(component, change, change_path)
       when "PBXBuildRule"
-        add_build_rule(component, change)
+        add_build_rule(component, change, change_path)
       when "PBXVariantGroup"
-        add_variant_group(component, change)
+        add_variant_group(component, change, change_path)
       when "PBXReferenceProxy"
-        add_reference_proxy(component, change)
+        add_reference_proxy(component, change, change_path)
       when "XCSwiftPackageProductDependency"
-        add_swift_package_product_dependency(component, change)
+        add_swift_package_product_dependency(component, change, change_path)
       when "XCRemoteSwiftPackageReference"
-        add_remote_swift_package_reference(component, change)
+        add_remote_swift_package_reference(component, change, change_path)
       else
         raise MergeError, "Trying to add unsupported component type #{change["isa"]}. Full " \
           "component change is: #{change}"
       end
     end
 
-    def add_remote_swift_package_reference(containing_component, change)
+    def add_remote_swift_package_reference(containing_component, change, change_path)
       remote_swift_package_reference =
         containing_component.project.new(Xcodeproj::Project::XCRemoteSwiftPackageReference)
-      add_attributes_to_component(remote_swift_package_reference, change)
+      add_attributes_to_component(remote_swift_package_reference, change, change_path)
 
       case containing_component
       when Xcodeproj::Project::XCSwiftPackageProductDependency
@@ -367,10 +566,10 @@ module Kintsugi
       end
     end
 
-    def add_swift_package_product_dependency(containing_component, change)
+    def add_swift_package_product_dependency(containing_component, change, change_path)
       swift_package_product_dependency =
         containing_component.project.new(Xcodeproj::Project::XCSwiftPackageProductDependency)
-      add_attributes_to_component(swift_package_product_dependency, change)
+      add_attributes_to_component(swift_package_product_dependency, change, change_path)
 
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
@@ -383,7 +582,7 @@ module Kintsugi
       end
     end
 
-    def add_reference_proxy(containing_component, change)
+    def add_reference_proxy(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
         # If there are two file references that refer to the same file, one with a build file and
@@ -403,85 +602,96 @@ module Kintsugi
         end
         containing_component.file_ref = file_reference
       when Xcodeproj::Project::PBXGroup
+        return if !Settings.allow_duplicates &&
+          !find_file_in_group(containing_component, Xcodeproj::Project::PBXReferenceProxy,
+                              change["path"]).nil?
+
         reference_proxy = containing_component.project.new(Xcodeproj::Project::PBXReferenceProxy)
         containing_component << reference_proxy
-        add_attributes_to_component(reference_proxy, change)
+        add_attributes_to_component(reference_proxy, change, change_path)
       else
         raise MergeError, "Trying to add reference proxy to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_variant_group(containing_component, change)
+    def add_variant_group(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
         containing_component.file_ref =
           find_variant_group(containing_component.project, change["displayName"])
       when Xcodeproj::Project::PBXGroup, Xcodeproj::Project::PBXVariantGroup
-        variant_group = containing_component.project.new(Xcodeproj::Project::PBXVariantGroup)
-        containing_component.children << variant_group
-        add_attributes_to_component(variant_group, change)
+        if find_group_in_group(containing_component, Xcodeproj::Project::PBXVariantGroup,
+                               change).nil?
+          raise "Group should have been added already, so this is most likely a bug in Kintsugi" \
+            "Change is: #{change}. Change path: #{change_path}"
+        end
       else
         raise MergeError, "Trying to add variant group to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_build_rule(target, change)
+    def add_build_rule(target, change, change_path)
       build_rule = target.project.new(Xcodeproj::Project::PBXBuildRule)
       target.build_rules << build_rule
-      add_attributes_to_component(build_rule, change)
+      add_attributes_to_component(build_rule, change, change_path)
     end
 
-    def add_shell_script_build_phase(target, change)
+    def add_shell_script_build_phase(target, change, change_path)
       build_phase = target.new_shell_script_build_phase(change["displayName"])
-      add_attributes_to_component(build_phase, change)
+      add_attributes_to_component(build_phase, change, change_path)
     end
 
-    def add_headers_build_phase(target, change)
-      add_attributes_to_component(target.headers_build_phase, change)
+    def add_headers_build_phase(target, change, change_path)
+      add_attributes_to_component(target.headers_build_phase, change, change_path)
     end
 
-    def add_sources_build_phase(target, change)
-      add_attributes_to_component(target.source_build_phase, change)
+    def add_sources_build_phase(target, change, change_path)
+      add_attributes_to_component(target.source_build_phase, change, change_path)
     end
 
-    def add_frameworks_build_phase(target, change)
-      add_attributes_to_component(target.frameworks_build_phase, change)
+    def add_frameworks_build_phase(target, change, change_path)
+      add_attributes_to_component(target.frameworks_build_phase, change, change_path)
     end
 
-    def add_resources_build_phase(target, change)
-      add_attributes_to_component(target.resources_build_phase, change)
+    def add_resources_build_phase(target, change, change_path)
+      add_attributes_to_component(target.resources_build_phase, change, change_path)
     end
 
-    def add_copy_files_build_phase(target, change)
+    def add_copy_files_build_phase(target, change, change_path)
       copy_files_phase_name = change["displayName"] == "CopyFiles" ? nil : change["displayName"]
       copy_files_phase = target.new_copy_files_build_phase(copy_files_phase_name)
 
-      add_attributes_to_component(copy_files_phase, change)
+      add_attributes_to_component(copy_files_phase, change, change_path)
     end
 
-    def add_build_configuration_list(target, change)
+    def add_build_configuration_list(target, change, change_path)
       target.build_configuration_list = target.project.new(Xcodeproj::Project::XCConfigurationList)
-      add_attributes_to_component(target.build_configuration_list, change)
+      add_attributes_to_component(target.build_configuration_list, change, change_path)
     end
 
-    def add_build_configuration(configuration_list, change)
+    def add_build_configuration(configuration_list, change, change_path)
       build_configuration = configuration_list.project.new(Xcodeproj::Project::XCBuildConfiguration)
       configuration_list.build_configurations << build_configuration
-      add_attributes_to_component(build_configuration, change)
+      add_attributes_to_component(build_configuration, change, change_path)
     end
 
-    def add_build_file(build_phase, change)
+    def add_build_file(build_phase, change, change_path)
       if change["fileRef"].nil?
         puts "Warning: Trying to add a build file without any file reference to build phase " \
           "'#{build_phase}'"
         return
       end
 
+      existing_build_file = build_phase.files.find do |build_file|
+        build_file.file_ref.path == change["fileRef"]["path"]
+      end
+      return if !Settings.allow_duplicates && !existing_build_file.nil?
+
       build_file = build_phase.project.new(Xcodeproj::Project::PBXBuildFile)
       build_phase.files << build_file
-      add_attributes_to_component(build_file, change)
+      add_attributes_to_component(build_file, change, change_path)
     end
 
     def find_variant_group(project, display_name)
@@ -490,7 +700,7 @@ module Kintsugi
       end
     end
 
-    def add_target_dependency(target, change)
+    def add_target_dependency(target, change, change_path)
       target_dependency = find_target(target.project, change["displayName"])
 
       if target_dependency
@@ -501,14 +711,14 @@ module Kintsugi
       target_dependency = target.project.new(Xcodeproj::Project::PBXTargetDependency)
 
       target.dependencies << target_dependency
-      add_attributes_to_component(target_dependency, change)
+      add_attributes_to_component(target_dependency, change, change_path)
     end
 
     def find_target(project, display_name)
       project.targets.find { |target| target.display_name == display_name }
     end
 
-    def add_container_item_proxy(component, change)
+    def add_container_item_proxy(component, change, change_path)
       container_proxy = component.project.new(Xcodeproj::Project::PBXContainerItemProxy)
       container_proxy.container_portal = find_containing_project_uuid(component.project, change)
 
@@ -521,7 +731,8 @@ module Kintsugi
         raise MergeError, "Trying to add container item proxy to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
-      add_attributes_to_component(container_proxy, change, ignore_keys: ["containerPortal"])
+      add_attributes_to_component(container_proxy, change, change_path,
+                                  ignore_keys: ["containerPortal"])
     end
 
     def find_containing_project_uuid(project, container_item_proxy_change)
@@ -552,14 +763,20 @@ module Kintsugi
       container_item_proxies.first.container_portal
     end
 
-    def add_subproject_reference(root_object, project_reference_change)
+    def add_subproject_reference(root_object, project_reference_change, change_path)
+      existing_subproject =
+        root_object.project_references.find do |project_reference|
+          project_reference.project_ref.path == project_reference_change["ProjectRef"]["path"]
+        end
+      return if !Settings.allow_duplicates && !existing_subproject.nil?
+
       filter_subproject_without_project_references = lambda do |file_reference|
         root_object.project_references.find do |project_reference|
           project_reference.project_ref.uuid == file_reference.uuid
         end.nil?
       end
       subproject_reference =
-        find_file(root_object.project, project_reference_change["ProjectRef"],
+        find_file(root_object.project, project_reference_change["ProjectRef"]["path"],
                   file_filter: filter_subproject_without_project_references)
 
       unless subproject_reference
@@ -578,7 +795,7 @@ module Kintsugi
       updated_project_reference_change =
         change_with_updated_subproject_uuid(project_reference_change, subproject_reference.uuid)
       add_attributes_to_component(project_reference, updated_project_reference_change,
-                                  ignore_keys: ["ProjectRef"])
+                                  change_path, ignore_keys: ["ProjectRef"])
     end
 
     def change_with_updated_subproject_uuid(change, subproject_reference_uuid)
@@ -590,19 +807,19 @@ module Kintsugi
       new_change
     end
 
-    def add_target(root_object, change)
+    def add_target(root_object, change, change_path)
       target = root_object.project.new(Xcodeproj::Project::PBXNativeTarget)
       root_object.project.targets << target
-      add_attributes_to_component(target, change)
+      add_attributes_to_component(target, change, change_path)
     end
 
-    def add_aggregate_target(root_object, change)
+    def add_aggregate_target(root_object, change, change_path)
       target = root_object.project.new(Xcodeproj::Project::PBXAggregateTarget)
       root_object.project.targets << target
-      add_attributes_to_component(target, change)
+      add_attributes_to_component(target, change, change_path)
     end
 
-    def add_file_reference(containing_component, change)
+    def add_file_reference(containing_component, change, change_path)
       # base configuration reference and product reference always reference a file that exists
       # inside a group, therefore in these cases the file is searched for.
       # In the case of group and variant group, the file can't exist in another group, therefore a
@@ -610,59 +827,74 @@ module Kintsugi
       case containing_component
       when Xcodeproj::Project::XCBuildConfiguration
         containing_component.base_configuration_reference =
-          find_file(containing_component.project, change)
+          find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXNativeTarget
-        containing_component.product_reference = find_file(containing_component.project, change)
+        containing_component.product_reference =
+          find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXBuildFile
-        containing_component.file_ref = find_file(containing_component.project, change)
+        containing_component.file_ref = find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXGroup, Xcodeproj::Project::PBXVariantGroup
-        file_reference = containing_component.project.new(Xcodeproj::Project::PBXFileReference)
-        containing_component.children << file_reference
-
-        # For some reason, `include_in_index` is set to `1` and `source_tree` to `SDKROOT` by
-        # default.
-        file_reference.include_in_index = nil
-        file_reference.source_tree = nil
-        add_attributes_to_component(file_reference, change)
+        if find_file_in_group(containing_component, Xcodeproj::Project::PBXFileReference,
+                              change["path"]).nil?
+          raise "File should have been added already, so this is most likely a bug in Kintsugi" \
+            "Change is: #{change}. Change path: #{change_path}"
+        end
       else
         raise MergeError, "Trying to add file reference to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_group(containing_component, change)
+    def find_file_in_group(group, instance_type, filepath)
+      group
+        .children
+        .select { |child| child.instance_of?(instance_type) }
+        .find { |file| file.path == filepath }
+    end
+
+    def adding_files_and_groups_allowed?(change_path)
+      change_path.start_with?("rootObject/mainGroup") ||
+        change_path.start_with?("rootObject/projectReferences")
+    end
+
+    def add_group(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::ObjectDictionary
         # It is assumed that an `ObjectDictionary` always represents a project reference.
         new_group = containing_component[:project_ref].project.new(Xcodeproj::Project::PBXGroup)
         containing_component[:product_group] = new_group
+        add_attributes_to_component(new_group, change, change_path)
       when Xcodeproj::Project::PBXGroup
-        new_group = containing_component.project.new(Xcodeproj::Project::PBXGroup)
-        containing_component.children << new_group
+        if find_group_in_group(containing_component, Xcodeproj::Project::PBXGroup, change).nil?
+          raise "Group should have been added already, so this is most likely a bug in Kintsugi" \
+            "Change is: #{change}. Change path: #{change_path}"
+        end
       else
         raise MergeError, "Trying to add group to an unsupported component type " \
-          "#{containing_component.isa}. Change is: #{change}"
+          "#{containing_component.isa}. Change is: #{change}. Change path: #{change_path}"
       end
-
-      add_attributes_to_component(new_group, change)
     end
 
-    def add_attributes_to_component(component, change, ignore_keys: [])
+    def add_attributes_to_component(component, change, change_path, ignore_keys: [])
       change.each do |change_name, change_value|
         next if (%w[isa displayName] + ignore_keys).include?(change_name)
 
         attribute_name = attribute_name_from_change_name(change_name)
         if simple_attribute?(component, attribute_name)
-          apply_change_to_simple_attribute(component, attribute_name, {added: change_value})
+          simple_attribute_change = {
+            added: change_value,
+            removed: simple_attribute_default_value(component, attribute_name)
+          }
+          apply_change_to_simple_attribute(component, attribute_name, simple_attribute_change)
           next
         end
 
         case change_value
         when Hash
-          add_child_to_component(component, change_value)
+          add_child_to_component(component, change_value, change_path)
         when Array
           change_value.each do |added_attribute_element|
-            add_child_to_component(component, added_attribute_element)
+            add_child_to_component(component, added_attribute_element, change_path)
           end
         else
           raise MergeError, "Trying to add attribute of unsupported type '#{change_value.class}' " \
@@ -671,16 +903,20 @@ module Kintsugi
       end
     end
 
-    def find_file(project, file_reference_change, file_filter: ->(_) { true })
+    def simple_attribute_default_value(component, attribute_name)
+      component.simple_attributes.find do |attribute|
+        attribute.name == attribute_name
+      end.default_value
+    end
+
+    def find_file(project, path, file_filter: ->(_) { true })
       file_references = project.files.select do |file_reference|
-        file_reference.path == file_reference_change["path"] && file_filter.call(file_reference)
+        file_reference.path == path && file_filter.call(file_reference)
       end
       if file_references.length > 1
-        puts "Debug: Found more than one matching file with path " \
-          "'#{file_reference_change["path"]}'. Using the first one."
+        puts "Debug: Found more than one matching file with path '#{path}'. Using the first one."
       elsif file_references.empty?
-        puts "Debug: No file reference found for file with path " \
-          "'#{file_reference_change["path"]}'."
+        puts "Debug: No file reference found for file with path '#{path}'."
         return
       end
 
@@ -689,12 +925,9 @@ module Kintsugi
 
     def find_reference_proxy(project, container_item_proxy_change, reference_filter: ->(_) { true })
       reference_proxies = project.root_object.project_references.map do |project_ref_and_products|
-        project_ref_and_products[:product_group].children.find do |product|
-          product.remote_ref.remote_global_id_string ==
-            container_item_proxy_change["remoteGlobalIDString"] &&
-            product.remote_ref.remote_info == container_item_proxy_change["remoteInfo"] &&
-            reference_filter.call(product)
-        end
+        find_reference_proxy_in_component(project_ref_and_products[:product_group].children,
+                                          container_item_proxy_change,
+                                          reference_filter: reference_filter)
       end.compact
 
       if reference_proxies.length > 1
@@ -708,5 +941,19 @@ module Kintsugi
 
       reference_proxies.first
     end
+
+    def find_reference_proxy_in_component(component, container_item_proxy_change,
+                                          reference_filter: ->(_) { true })
+      component.find do |product|
+        product.remote_ref.remote_global_id_string ==
+          container_item_proxy_change["remoteGlobalIDString"] &&
+          product.remote_ref.remote_info == container_item_proxy_change["remoteInfo"] &&
+          reference_filter.call(product)
+      end
+    end
+
+    def join_path(left, right)
+      left.empty? ? right : "#{left}/#{right}"
+    end
   end
 end