ast-merge-git 7.1.9 → 7.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0948b2cf9835a3a0726b52a9619be02dabf95e0da008e299644e4916b8da7ed3'
-  data.tar.gz: 03d94e0ee7627a85899bd7f33afbe5ee60c60c54b59a8a37b321830fc1fb6112
+  metadata.gz: 0fd20591b0e3de1b3a8c6765f85cdedc5d3f19fea69e1be9d6490d50af756a54
+  data.tar.gz: 92b8bbab49809926e97922d7092992ac1c54f1e82bd15f0af1b9e0a0f52d0aea
 SHA512:
-  metadata.gz: 42871ebd37702ea5d2c36968f5e1dd2ec7415d86c2f71fc7efebf961a1589917f5217d89b24f2769357ad51d43a01f59fc74320bf6867a2db2459da6b382445a
-  data.tar.gz: 31e29b5f3c7f38cb600f33100c57bd9aaed8b6319a98fe93dcc7380cde48644fa44ad15822258edd297707730d7ff478b4adc7bec22853f8f47b2b5fb4a9d821
+  metadata.gz: 21e177752270944833a9a50e1fc3845614db43959949b7abdfc46ea3b6b7b840e8c4c1c8d46405d7b7d3299a9f309f8df29060ed133ab093bee5a81f3e324200
+  data.tar.gz: 21caa075844f315ce7aa7f51a700328ac5f86cb6e03a3bbaa0a18a3e5c945910b4d7548c7253e49b82f93323eb82adc1902bce034a469380c455d3feba152210

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

@@ -1049,7 +1049,8 @@ module Ast
             item,
             capture.fetch(:status),
             checks,
-            stderr: capture.fetch(:stderr, '')
+            stderr: capture.fetch(:stderr, ''),
+            conflict_regions: markers
           )
           eligible = item.dig('oracle', 'score_eligible') && !%w[unsupported excluded_ambiguous].include?(classified)
           {
@@ -1217,9 +1218,13 @@ module Ast
           'analyzed'
         end
 
-        def classify(item, status, checks, stderr: '')
+        def classify(item, status, checks, stderr: '', conflict_regions: [])
           expected = item.dig('expected', 'outcome')
           return 'excluded_ambiguous' if expected == 'excluded_ambiguous'
+          # Exit 1 alone also describes Ruby startup failures and other crashes.
+          # Require an emitted marker region or the portable conflict diagnostic;
+          # the expected oracle must never turn an unexplained failure into success.
+          return 'error' if status == 1 && conflict_regions.empty? && !conflict_diagnostic?(stderr)
 
           if expected == 'error'
             return 'error' if status.nil?
@@ -1240,6 +1245,13 @@ module Ast
           status >= 2 && /\A[^:\r\n]+: (?:destination_)?parse_error:/i.match?(stderr.to_s)
         end
 
+        def conflict_diagnostic?(stderr)
+          # This parses a diagnostic transport header, not source syntax/ownership.
+          # Older kernel adapters omit a separate code but still emit the
+          # explicit category. Do not reject that established wire format.
+          /\A[^:\r\n]+: merge_conflict: [^\s][^\r\n]*/i.match?(stderr.to_s)
+        end
+
         def equivalence_checks(item, output)
           expected = item.dig('expected', 'output', 'bytes')
           exact = !expected.nil? && output == expected
@@ -1413,10 +1425,15 @@ module Ast
         def conflict_regions(output)
           ranges = []
           start_byte = nil
+          separator = false
           offset = 0
           output.each_line do |line|
-            start_byte = offset if line.start_with?('<<<<<<<')
-            if start_byte && line.start_with?('>>>>>>>')
+            if line.start_with?('<<<<<<<')
+              start_byte = offset
+              separator = false
+            end
+            separator = true if start_byte && line.start_with?('=======')
+            if start_byte && separator && line.start_with?('>>>>>>>')
               ranges << { 'start_byte' => start_byte, 'end_byte' => offset + line.bytesize }
               start_byte = nil
             end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'ast/merge'
+require 'ast/merge/typed_core_provider'
+
+module Ast
+  module Merge
+    module Git
+      # Compatibility name only: Rust owns merge decisions and marker rendering.
+      class RustHostProvider < Ast::Merge::TypedCoreProvider
+        PROVIDER_ID = 'rust.git.json'
+        FAMILY = 'json'
+        OPERATIONS = [:merge3].freeze
+        CORE_PROVIDER = 'kernel.git.json'
+        CORE_PROFILE = 'kernel.git.json.v1'
+        PACKAGE = 'ast-merge-git'
+
+        private
+
+        def package_version = Ast::Merge::Git::Version::VERSION
+
+        # path_name is context, never a substitute for the explicit dialect.
+        def additional_fields = %i[path_name labels conflict_marker_size]
+
+        def policy(_operation, request)
+          labels = request.fetch(:labels, {})
+          unless labels.is_a?(Hash) && labels.values.all? do |label|
+            label.is_a?(String)
+          end
+            raise ArgumentError,
+                  'Git labels must be a Hash of text values'
+          end
+
+          width = request[:conflict_marker_size]
+          width = Integer(width, 10) if width.is_a?(String) # Git argv is textual.
+          raise ArgumentError, 'Git marker width must be an Integer' unless width.nil? || width.is_a?(Integer)
+
+          core::OperationPolicy.from_merge3(core::ThreeWayMergePolicy.new(
+                                              render_policy: 'source-preserving', fallback_policy: 'none',
+                                              labels: labels.transform_keys(&:to_s), conflict_marker_size: width, extra: {}
+                                            ))
+        end
+      end
+    end
+  end
+end
+
+Ast::Merge::Git.register_rust_host_provider! if Ast::Merge::Git::RustHostProvider.available?

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.9'
+        VERSION = '7.1.10'
       end
       # Current gem version exposed at the traditional constant location.
       VERSION = Version::VERSION # Traditional Constant Location

data/lib/ast/merge/git.rb

@@ -12,6 +12,7 @@ module Ast
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ModuleLength -- Git protocol translation is one cohesive adapter boundary
     module Git
       PACKAGE_NAME = 'ast-merge-git'
+      autoload :RustHostProvider, 'ast/merge/git/rust_host_provider'
       EXIT_SUCCESS = 0
       EXIT_CONFLICT = 1
       EXIT_ERROR = 2
@@ -21,6 +22,13 @@ module Ast
         invalid_provider_output
         invalid_provider_result
       ].freeze
+      RUST_PROVIDER_FAMILIES = {
+        'bash' => 'Bash::Merge',
+        'go' => 'Go::Merge',
+        'json' => 'Json::Merge',
+        'rust' => 'Rust::Merge',
+        'typescript' => 'TypeScript::Merge'
+      }.freeze
 
       module_function
 
@@ -32,6 +40,14 @@ module Ast
         adapt_provider_result(adapter_failure(:invalid_provider_result, e.message))
       end
 
+      def rust_host_provider
+        RustHostProvider.new
+      end
+
+      def register_rust_host_provider!(replace: false)
+        Ast::Merge.register_provider(rust_host_provider, replace: replace)
+      end
+
       def merge_files(base_path:, ours_path:, theirs_path:, conflict_policy: :write, **request)
         policy = normalize_conflict_policy(conflict_policy)
         result = merge3(
@@ -51,6 +67,7 @@ module Ast
       def run(argv, env: ENV, stderr: $stderr)
         load_provider_requirements(env['AST_MERGE_REQUIRE'])
         request = command_request(argv, env)
+        register_explicit_rust_provider(request)
         result = merge_files(**request)
         emit_diagnostics(result, stderr)
         result.dig(:git, :exit_code)
@@ -255,6 +272,28 @@ module Ast
       end
       private_class_method :load_provider_requirements
 
+      def register_explicit_rust_provider(request)
+        provider_id = request[:provider_id].to_s
+        if provider_id == 'rust.git.json'
+          register_rust_host_provider!(replace: true) if RustHostProvider.available?
+          return
+        end
+        return unless provider_id.start_with?('rust.')
+
+        family_module_name = RUST_PROVIDER_FAMILIES[request[:family].to_s]
+        return unless family_module_name
+
+        family_module = family_module_name.split('::').inject(Object) do |namespace, name|
+          break nil unless namespace.const_defined?(name, false)
+
+          namespace.const_get(name, false)
+        end
+        return unless family_module.respond_to?(:register_rust_host_provider!)
+
+        family_module.register_rust_host_provider!(replace: true)
+      end
+      private_class_method :register_explicit_rust_provider
+
       def emit_diagnostics(result, stderr)
         result.fetch(:diagnostics).each do |item|
           stderr.puts("#{PACKAGE_NAME}: #{item[:category]}: #{item[:message]}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge-git
 version: !ruby/object:Gem::Version
-  version: 7.1.9
+  version: 7.1.10
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
 description: "☯️ Git protocol adaptation and provider dispatch over ast-merge primitives."
 email:
 - floss@galtzo.com
@@ -303,6 +303,7 @@ files:
 - lib/ast/merge/git/benchmark_adapter.rb
 - lib/ast/merge/git/corpus.rb
 - lib/ast/merge/git/local_benchmark.rb
+- lib/ast/merge/git/rust_host_provider.rb
 - lib/ast/merge/git/version.rb
 - sig/ast/merge/git.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
@@ -311,10 +312,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.9
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.9/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.10
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.10/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.9
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.10
   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
@@ -344,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "☯️ Format-neutral Git merge-driver adapter for StructuredMerge"
 test_files: []