ast-merge-git 7.1.6 → 7.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f77299ac80ed9c1b08218ab290de6784428c7fc691e1693df0f6a074b33a6cd
-  data.tar.gz: 4b43c57ae0f44ce041cc3db5ae098e0f517666a634f791414d3860893caa404b
+  metadata.gz: 2943a67a2400053c0f535008977a3aad094685b0fd2c21423694a7e611176a2b
+  data.tar.gz: a734402394056e68c03fab8a40e23b3a6be091e98f77275921202d15e1915c37
 SHA512:
-  metadata.gz: 81a80302f650d7f80415a5fa34a2b0e3ceb3bcab3169a8eb15000b592e994e71a9ae9377e47b033e6f3fa50ddde34c8585aa2ba756ccefaf24cd4950ba7de484
-  data.tar.gz: 7608307153363924e423f9ed7f0021407094e5520c2b919c6e40c4f676f54168c4cb6e4658059b978fc1bb255e944cec52fb66238c18bc834110f14a6c3cf838
+  metadata.gz: 13a17a48ce7ffed824dd30841e4a1f8f236aa8237b3ca38020db745ac4c12ffbe47ebdbc69ff290725776cafd71d2fa1b2c67c251b87749a7f36a9d06393b060
+  data.tar.gz: a70e57f231ac0fc014aa0b6e49eccfc14a0cab8aefbd8a3ae9d781da8a72253fa6af584c26edb13d6208e01d8162cc67e8c4413610698a9050edf60ab8fc5014

data/exe/ast-merge-git

@@ -3,31 +3,42 @@
 
 require 'ast/merge/git'
 
-if ARGV.first == 'benchmark-provider-diff'
+if %w[benchmark-provider-diff benchmark-provider-merge2].include?(ARGV.first)
   require 'json'
 
   begin
-    before_path, after_path, path_name = ARGV.drop(1)
-    raise ArgumentError, 'before, after, and path name are required' unless before_path && after_path && path_name
+    command = ARGV.first
+    first_path, second_path, path_name = ARGV.drop(1)
+    raise ArgumentError, 'two source paths and path name are required' unless first_path && second_path && path_name
 
+    operation, role_sources = if command == 'benchmark-provider-diff'
+                                [:diff2, {
+                                  before_source: File.binread(first_path),
+                                  after_source: File.binread(second_path)
+                                }]
+                              else
+                                [:merge2, {
+                                  incoming_source: File.binread(first_path),
+                                  current_source: File.binread(second_path)
+                                }]
+                              end
     require ENV.fetch('AST_MERGE_REQUIRE')
     result = Ast::Merge.dispatch_provider(
-      :diff2,
+      operation,
       {
         provider_id: ENV.fetch('AST_MERGE_PROVIDER'),
         family: ENV.fetch('AST_MERGE_FAMILY'),
         dialect: ENV.fetch('AST_MERGE_DIALECT'),
         backend: ENV.fetch('AST_MERGE_BACKEND'),
         profile_id: ENV.fetch('AST_MERGE_PROFILE'),
-        before_source: File.binread(before_path),
-        after_source: File.binread(after_path),
-        path_name: path_name
+        path_name: path_name,
+        **role_sources
       }
     )
     puts JSON.generate(Ast::Merge.json_ready(result))
     exit(result[:ok] == true ? 0 : 2)
   rescue ArgumentError, Ast::Merge::Error, KeyError, LoadError, SystemCallError => e
-    warn "ast-merge-git benchmark-provider-diff: #{e.message}"
+    warn "ast-merge-git #{ARGV.first}: #{e.message}"
     exit 2
   end
 end

data/lib/ast/merge/git/local_benchmark.rb

@@ -15,8 +15,8 @@ module Ast
         Error = Class.new(StandardError)
         SCHEMA = 'structuredmerge.benchmark.corpus/v1'
         CASE_SCHEMA = 'structuredmerge.benchmark/v1'
-        OPERATIONS = %w[merge3 metamorphic diff].freeze
-        EXECUTABLE_OPERATIONS = %w[merge3 metamorphic].freeze
+        OPERATIONS = %w[merge2 merge3 metamorphic diff].freeze
+        EXECUTABLE_OPERATIONS = %w[merge2 merge3 metamorphic].freeze
         PARTITIONS = %w[sentinel gold metamorphic].freeze
         EXPECTATIONS = %w[clean conflict error excluded_ambiguous].freeze
         SEVERITIES = %w[none low high critical].freeze
@@ -34,6 +34,7 @@ module Ast
         ].freeze
         SELECTOR_FIELDS = %w[provider_id family dialect backend profile require].freeze
         INPUT_ROLES = {
+          'merge2' => %w[incoming current],
           'merge3' => %w[base ours theirs],
           'metamorphic' => %w[source transformed],
           'diff' => %w[before after]
@@ -267,7 +268,7 @@ module Ast
         end
 
         def validate_operation!(item, id)
-          if item['operation'] == 'merge3'
+          if %w[merge2 merge3].include?(item['operation'])
             require_keys(item, %w[expected expected_conflicts], id)
             expectation = item.dig('expected', 'outcome')
             error!("#{id}: unsupported expected outcome") unless EXPECTATIONS.include?(expectation)
@@ -433,6 +434,7 @@ module Ast
         end
 
         def execute_case(item)
+          return execute_merge2_case(item) if item['operation'] == 'merge2'
           return execute_merge3_case(item) if item['operation'] == 'merge3'
           return execute_metamorphic_case(item) if item['operation'] == 'metamorphic'
 
@@ -496,6 +498,20 @@ module Ast
           FileUtils.rm_rf(workspace) if workspace
         end
 
+        def execute_merge2_case(item)
+          workspace = @tmp_root.join("#{safe_id(item['id'])}-#{Process.pid}")
+          FileUtils.rm_rf(workspace)
+          FileUtils.mkdir_p(workspace)
+          write_merge2_roles(item, workspace)
+          baseline = execute_merge2_baseline(item, workspace)
+          candidate = execute_merge2_candidate(item, workspace)
+          rerun = execute_merge2_candidate(item, workspace)
+          candidate['deterministic_correctness_rerun'] = correctness_record(candidate) == correctness_record(rerun)
+          [baseline, candidate]
+        ensure
+          FileUtils.rm_rf(workspace) if workspace
+        end
+
         def execute_metamorphic_case(item)
           workspace = @tmp_root.join("#{safe_id(item['id'])}-#{Process.pid}")
           FileUtils.rm_rf(workspace)
@@ -542,6 +558,47 @@ module Ast
           end
         end
 
+        def write_merge2_roles(item, workspace)
+          %w[incoming current].each do |role|
+            workspace.join(role).binwrite(item.dig('inputs', role, 'bytes'))
+          end
+        end
+
+        def execute_merge2_baseline(item, workspace)
+          started = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+          output = workspace.join('incoming').binread
+          capture = {
+            stdout: '',
+            stderr: '',
+            status: 0,
+            output: output,
+            duration_ns: Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond) - started
+          }
+          raw_result(item, 'template.overwrite', capture)
+        end
+
+        def execute_merge2_candidate(item, workspace)
+          selector = item.fetch('selector')
+          capture = timed_capture(
+            candidate_env(selector),
+            @driver_path.to_s,
+            'benchmark-provider-merge2',
+            'incoming',
+            'current',
+            "#{item['id']}.#{item['dialect']}",
+            chdir: workspace
+          )
+          result = capture[:stdout].empty? ? {} : JSON.parse(capture[:stdout])
+          capture[:output] = capture[:status].zero? ? result.fetch('output') : ''
+          raw_result(item, 'ast-merge-provider.merge2', capture)
+        rescue JSON::ParserError, KeyError => e
+          capture ||= { stdout: '', stderr: '', status: 2, duration_ns: 0 }
+          capture[:stderr] = [capture[:stderr], e.message].reject(&:empty?).join("\n")
+          capture[:status] = 2
+          capture[:output] = ''
+          raw_result(item, 'ast-merge-provider.merge2', capture)
+        end
+
         def write_metamorphic_roles(item, workspace)
           %w[source transformed].each do |role|
             workspace.join(role).binwrite(item.dig('inputs', role, 'bytes'))
@@ -632,7 +689,12 @@ module Ast
           output = capture&.fetch(:output, '') || ''
           checks = equivalence_checks(item, output)
           markers = conflict_regions(output)
-          classified = outcome || classify(item, capture.fetch(:status), checks)
+          classified = outcome || classify(
+            item,
+            capture.fetch(:status),
+            checks,
+            stderr: capture.fetch(:stderr, '')
+          )
           eligible = item.dig('oracle', 'score_eligible') && !%w[unsupported excluded_ambiguous].include?(classified)
           {
             'schema_version' => 'structuredmerge.benchmark.result/v1',
@@ -664,8 +726,15 @@ module Ast
         end
 
         def adapter_role(adapter)
-          return 'baseline' if adapter.start_with?('git.')
-          return 'candidate' if %w[ast-merge-git ast-merge-provider.diff2 structuredmerge.unsupported].include?(adapter)
+          return 'baseline' if adapter.start_with?('git.') || adapter == 'template.overwrite'
+
+          candidates = %w[
+            ast-merge-git
+            ast-merge-provider.diff2
+            ast-merge-provider.merge2
+            structuredmerge.unsupported
+          ]
+          return 'candidate' if candidates.include?(adapter)
 
           'competitor'
         end
@@ -792,18 +861,26 @@ module Ast
           'analyzed'
         end
 
-        def classify(item, status, checks)
+        def classify(item, status, checks, stderr: '')
           expected = item.dig('expected', 'outcome')
           return 'excluded_ambiguous' if expected == 'excluded_ambiguous'
+          if expected == 'error'
+            return 'error' if status.nil?
+            return expected_error_diagnostic?(status, stderr) ? 'correct_clean' : 'error' if status >= 2
+            return status == 1 ? 'false_conflict' : 'false_auto_merge'
+          end
           return 'error' if status.nil? || status >= 2
-          return status == 1 ? 'false_conflict' : 'false_auto_merge' if expected == 'error'
           return status == 1 ? 'true_conflict' : 'false_auto_merge' if expected == 'conflict'
           return 'false_conflict' if status == 1
-          return 'correct_clean' if checks['acceptable']
+          return 'correct_clean' if checks['equivalence_acceptable']
 
           'false_auto_merge'
         end
 
+        def expected_error_diagnostic?(status, stderr)
+          status >= 2 && /\Aast-merge-git: parse_error:/i.match?(stderr.to_s)
+        end
+
         def equivalence_checks(item, output)
           expected = item.dig('expected', 'output', 'bytes')
           exact = !expected.nil? && output == expected
@@ -825,8 +902,19 @@ module Ast
             'accepted_equivalence' => selected&.fetch('class'),
             'parse_validity_only_accepted' => false
           }
-          violations = preservation_violations(item, checks, output)
-          checks.merge('preservation_violations' => violations, 'acceptable' => !selected.nil? && violations.empty?)
+          preservation = preservation_evaluations(item, checks, output)
+          violations = preservation.filter_map { |name, status| name if status == 'fail' }
+          unverified = preservation.filter_map { |name, status| name if status == 'unverified' }
+          equivalence_acceptable = !selected.nil?
+          preservation_acceptable = violations.empty? && unverified.empty?
+          checks.merge(
+            'preservation_evaluations' => preservation,
+            'preservation_violations' => violations,
+            'preservation_unverified' => unverified,
+            'equivalence_acceptable' => equivalence_acceptable,
+            'preservation_acceptable' => preservation_acceptable,
+            'acceptable' => equivalence_acceptable && preservation_acceptable
+          )
         end
 
         def structural_equivalence(item, output, expected)
@@ -872,35 +960,54 @@ module Ast
             'preservation' => {
               'eligible' => eligible,
               'requirements' => item['preservation_policy'],
-              'violations' => checks.fetch('preservation_violations')
+              'violations' => checks.fetch('preservation_violations', []),
+              'unverified' => checks.fetch('preservation_unverified', [])
             },
             'performance' => { 'quality_offset_allowed' => false }
           }
         end
 
-        def preservation_violations(item, checks, output)
-          return [] if checks['exact']
-
+        def preservation_evaluations(item, checks, output)
           expected = item.dig('expected', 'output', 'bytes')
-          return [] unless expected
+          return {} unless expected
 
-          item['preservation_policy'].filter_map do |name, requirement|
-            next unless requirement == 'required'
-            next unless preservation_violation?(name, output, expected, checks)
+          item['preservation_policy'].to_h do |name, requirement|
+            next [name, 'not_required'] unless requirement == 'required'
+            next [name, 'pass'] if checks['exact']
 
-            name
+            [name, preservation_evaluation(name, output, expected, checks)]
           end
         end
 
-        def preservation_violation?(name, output, expected, checks)
+        def preservation_evaluation(name, output, expected, checks)
           case name
-          when 'encoding' then output.encoding != expected.encoding
-          when 'line_endings' then line_ending_style(output) != line_ending_style(expected)
-          when 'unknown_fields' then checks['structural'] != true
-          else output != expected
+          when 'encoding'
+            encoding_signature(output) == encoding_signature(expected) ? 'pass' : 'fail'
+          when 'line_endings'
+            line_ending_style(output) == line_ending_style(expected) ? 'pass' : 'fail'
+          when 'unknown_fields'
+            checks['structural'] == true ? 'pass' : 'unverified'
+          when 'formatting', 'source_regions'
+            output == expected ? 'pass' : 'fail'
+          else
+            'unverified'
           end
         end
 
+        def encoding_signature(content)
+          bytes = content.b
+          bom = if bytes.start_with?("\xEF\xBB\xBF".b)
+                  'utf-8-bom'
+                elsif bytes.start_with?("\xFF\xFE".b)
+                  'utf-16le-bom'
+                elsif bytes.start_with?("\xFE\xFF".b)
+                  'utf-16be-bom'
+                end
+          return bom if bom
+
+          bytes.dup.force_encoding(Encoding::UTF_8).valid_encoding? ? 'utf-8' : 'binary'
+        end
+
         def line_ending_style(content)
           return 'crlf' if content.include?("\r\n")
 
@@ -1066,6 +1173,11 @@ module Ast
         def build
           pairs = @results.group_by { |result| result['case_id'] }.values.map { |items| transition(items) }
           false_auto_merges = candidate_eligible.select { |item| item['outcome'] == 'false_auto_merge' }
+          preservation_failures = candidate_eligible.select do |item|
+            item.dig('dimensions', 'preservation', 'violations').any? ||
+              item.dig('dimensions', 'preservation', 'unverified').any?
+          end
+          unexpected_errors = candidate_results.select { |item| item['outcome'] == 'error' }
           {
             'schema_version' => 'structuredmerge.benchmark.report/v1',
             'kind' => 'paired_aggregate_report',
@@ -1082,15 +1194,20 @@ module Ast
               },
               'effectiveness' => outcome_counts,
               'preservation' => {
-                'eligible' => eligible.length,
-                'violation_result_ids' => eligible.filter_map do |item|
+                'eligible' => candidate_eligible.length,
+                'violation_result_ids' => candidate_eligible.filter_map do |item|
                   item['id'] if item.dig('dimensions', 'preservation', 'violations').any?
-                end
+                end,
+                'unverified_result_ids' => candidate_eligible.filter_map do |item|
+                  item['id'] if item.dig('dimensions', 'preservation', 'unverified').any?
+                end,
+                'gate' => preservation_failures.empty? ? 'pass' : 'fail'
               },
               'performance' => performance,
-              'reliability' => { 'error_result_ids' => @results.filter_map do |item|
-                item['id'] if item['outcome'] == 'error'
-              end },
+              'reliability' => {
+                'error_result_ids' => unexpected_errors.map { |item| item['id'] },
+                'gate' => unexpected_errors.empty? ? 'pass' : 'fail'
+              },
               'coverage' => coverage,
               'competitive' => competitive
             },
@@ -1099,7 +1216,7 @@ module Ast
             'newly_passing_case_ids' => pairs.filter_map { |pair| pair['case_id'] if pair['newly_passing'] },
             'newly_failing_case_ids' => pairs.filter_map { |pair| pair['case_id'] if pair['newly_failing'] },
             'changed_conflict_case_ids' => pairs.filter_map { |pair| pair['case_id'] if pair['changed_conflict'] },
-            'hard_gate_failed' => false_auto_merges.any?,
+            'hard_gate_failed' => false_auto_merges.any? || preservation_failures.any? || unexpected_errors.any?,
             'scalar_score' => nil
           }
         end
@@ -1114,6 +1231,10 @@ module Ast
           eligible.select { |item| item['adapter_role'] == 'candidate' }
         end
 
+        def candidate_results
+          @results.select { |item| item['adapter_role'] == 'candidate' }
+        end
+
         def outcome_counts
           %w[correct_clean false_conflict true_conflict false_auto_merge error unsupported
              excluded_ambiguous].to_h do |outcome|

data/lib/ast/merge/git/version.rb

@@ -6,7 +6,7 @@ module Ast
       # Version namespace for this gem.
       module Version
         # Current gem version.
-        VERSION = '7.1.6'
+        VERSION = '7.1.7'
       end
       # Current gem version exposed at the traditional constant location.
       VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge-git
 version: !ruby/object:Gem::Version
-  version: 7.1.6
+  version: 7.1.7
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.6
+        version: 7.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.6
+        version: 7.1.7
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -296,10 +296,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.6
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.6/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.7
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.6
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.7
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ast-merge-git