git 4.4.1 → 5.0.0.beta.1

data/lib/git/branches.rb

@@ -1,68 +1,174 @@
 # frozen_string_literal: true
 
+require 'git/base'
+
 module Git
-  # object that holds all the available branches
+  # Collection of all Git branches in a repository
+  #
+  # Wraps both local and remote-tracking branches and provides filtering,
+  # enumeration, and name-based lookup.
+  #
+  # @example Enumerate all branches
+  #   branches = repo.branches
+  #   branches.each { |b| puts b.name }
+  #
+  # @api public
+  #
   class Branches
     include Enumerable
 
+    # Creates a new Branches collection populated from the given repository
+    #
+    # @param base [Git::Base, Git::Repository] the repository to enumerate
+    #   branches from
+    #
+    # @return [void]
+    #
+    # @raise [Git::FailedError] if git exits with a non-zero exit status
+    #
     def initialize(base)
       @branches = {}
+      @lookup = {}
 
       @base = base
 
-      @base.lib.branches_all.each do |b|
-        @branches[b[0]] = Git::Branch.new(@base, b[0])
+      branch_repository.branches_all.each do |branch_info|
+        branch = Git::Branch.new(base, branch_info)
+
+        @branches[branch_info.refname] = branch
+        index_branch_lookup(branch, refname: branch_info.refname)
       end
     end
 
+    # Returns all local (non-remote-tracking) branches
+    #
+    # @example List local branch names
+    #   repo.branches.local.map(&:name)
+    #
+    # @return [Array<Git::Branch>] the local branches
+    #
     def local
       reject(&:remote)
     end
 
+    # Returns all remote-tracking branches
+    #
+    # @example List remote branch names
+    #   repo.branches.remote.map(&:name)
+    #
+    # @return [Array<Git::Branch>] the remote-tracking branches
+    #
     def remote
       self.select(&:remote)
     end
 
-    # array like methods
-
+    # Returns the number of branches in the collection
+    #
+    # @example Count all branches
+    #   repo.branches.size  # => 3
+    #
+    # @return [Integer] the total number of branches
+    #
     def size
       @branches.size
     end
 
+    # Iterates over every branch in the collection
+    #
+    # @overload each
+    #
+    #   @example Get an enumerator over all branches
+    #     enum = repo.branches.each
+    #
+    #   @return [Enumerator<Git::Branch>] an enumerator over all branches
+    #
+    # @overload each(&block)
+    #
+    #   @example Print every branch name
+    #     repo.branches.each { |b| puts b.name }
+    #
+    #   @return [Array<Git::Branch>] the full list of branches
+    #
+    #   @yield [branch] passes each branch to the block
+    #
+    #   @yieldparam branch [Git::Branch] a branch in the repository
+    #
+    #   @yieldreturn [void]
+    #
     def each(&)
       @branches.values.each(&)
     end
 
-    # Returns the target branch
+    # Returns the branch with the given name
+    #
+    # Supports short names (`'main'`), remote-qualified names
+    # (`'working/master'`), and full refspec names
+    # (`'remotes/working/master'`).
     #
-    # Example:
-    #   Given (git branch -a):
-    #    master
-    #    remotes/working/master
+    # @example Look up a branch by short name
+    #   repo.branches['main']
     #
-    #   g.branches['master'].full #=> 'master'
-    #   g.branches['working/master'].full => 'remotes/working/master'
-    #   g.branches['remotes/working/master'].full => 'remotes/working/master'
+    # @example Look up a remote-tracking branch
+    #   repo.branches['working/master']
+    #
+    # @param branch_name [#to_s] the name of the branch to retrieve
+    #
+    # @return [Git::Branch, nil] the matching branch, or `nil` if not found
     #
-    # @param [#to_s] branch_name the target branch name.
-    # @return [Git::Branch] the target branch.
     def [](branch_name)
-      @branches.values.each_with_object(@branches) do |branch, branches|
-        branches[branch.full] ||= branch
-
-        # This is how Git (version 1.7.9.5) works.
-        # Lets you ignore the 'remotes' if its at the beginning of the branch full
-        # name (even if is not a real remote branch).
-        branches[branch.full.sub('remotes/', '')] ||= branch if branch.full =~ %r{^remotes/.+}
-      end[branch_name.to_s]
+      @lookup[branch_name.to_s]
     end
 
+    # Returns a string listing all branches, prefixed with `*` for the current branch
+    #
+    # @example Display all branches
+    #   puts repo.branches.to_s
+    #
+    # @return [String] a formatted branch listing
+    #
     def to_s
-      out = ''
+      out = +''
       @branches.each_value do |b|
         out << (b.current ? '* ' : '  ') << b.to_s << "\n"
       end
       out
     end
+
+    private
+
+    # Resolves the {Git::Repository} for this collection of branches
+    #
+    # Accepts either a {Git::Repository} (new form) or a {Git::Base} (legacy).
+    # The `is_a?(Git::Base)` guard will be removed when {Git::Base} is deleted
+    # in Phase 4.
+    #
+    # @return [Git::Repository] the repository used to enumerate branches
+    #
+    # @api private
+    #
+    def branch_repository
+      @base.is_a?(Git::Base) ? @base.facade_repository : @base
+    end
+
+    # Indexes all supported lookup keys for a branch without mutating
+    # the canonical `@branches` collection used by enumeration
+    #
+    # @param branch [Git::Branch] the branch to index
+    #
+    # @param refname [String] the full refname key to use for primary lookup
+    #
+    # @return [void]
+    #
+    # @api private
+    #
+    def index_branch_lookup(branch, refname:)
+      @lookup[refname] ||= branch
+      @lookup[branch.full] ||= branch
+
+      return unless branch.full.start_with?('remotes/')
+
+      # Mirror git compatibility: allow omitting a leading "remotes/".
+      @lookup[branch.full.delete_prefix('remotes/')] ||= branch
+    end
   end
 end

data/lib/git/command_line/base.rb

@@ -0,0 +1,245 @@
+# frozen_string_literal: true
+
+require 'git/command_line'
+require 'git/errors'
+
+module Git
+  module CommandLine
+    # Abstract base class for git command-line execution strategies
+    #
+    # Concrete subclasses must implement {#run} to execute a git command and
+    # return a {Git::CommandLine::Result}. Two implementations are provided:
+    #
+    # * {Git::CommandLine::Capturing} — buffers stdout and stderr in memory
+    # * {Git::CommandLine::Streaming} — streams stdout to a caller-supplied IO
+    #
+    # @example Instantiate a concrete subclass
+    #   env = { 'GIT_DIR' => '/path/to/git/dir' }
+    #   binary_path = '/usr/bin/git'
+    #   global_opts = %w[--git-dir /path/to/git/dir]
+    #   logger = Logger.new($stdout)
+    #   cli = Git::CommandLine::Capturing.new(env, binary_path, global_opts, logger)
+    #   cli.run('version') #=> #<Git::CommandLine::Result ...>
+    #
+    # @abstract Subclass and implement {#run}
+    #
+    # @api public
+    #
+    class Base
+      # Create a Base (or subclass) object
+      #
+      # @param env [Hash{String => String, nil}] environment variables to set or
+      #   unset. String values set the variable; `nil` values unset it.
+      #
+      # @param binary_path [String] the path to the git binary
+      #
+      # @param global_opts [Array<String>] global options to pass to git
+      #
+      # @param logger [Logger] the logger to use
+      #
+      def initialize(env, binary_path, global_opts, logger)
+        @env = env
+        @binary_path = binary_path
+        @global_opts = global_opts
+        @logger = logger
+      end
+
+      # Execute a git command and return the result
+      #
+      # Concrete subclasses must override this method.
+      #
+      # @raise [NotImplementedError] always — must be implemented by subclasses
+      #
+      def run(*)
+        raise NotImplementedError, "#{self.class}#run is not implemented"
+      end
+
+      # @attribute [r] env
+      #
+      # Variables to set (or unset) in the git command's environment
+      #
+      # @example
+      #   env = { 'GIT_DIR' => '/path/to/git/dir' }
+      #   cli = Git::CommandLine::Capturing.new(env, '/usr/bin/git', [], Logger.new(nil))
+      #   cli.env #=> { 'GIT_DIR' => '/path/to/git/dir' }
+      #
+      # @return [Hash{String => String, nil}]
+      #
+      # @see https://ruby-doc.org/3.2.1/Process.html#method-c-spawn Process.spawn
+      #   for details on how to set environment variables using the `env` parameter
+      #
+      attr_reader :env
+
+      # @attribute [r] binary_path
+      #
+      # The path to the command line binary to run
+      #
+      # @example
+      #   cli = Git::CommandLine::Capturing.new({}, '/usr/bin/git', [], Logger.new(nil))
+      #   cli.binary_path #=> '/usr/bin/git'
+      #
+      # @return [String]
+      #
+      attr_reader :binary_path
+
+      # @attribute [r] global_opts
+      #
+      # The global options to pass to git
+      #
+      # These are options that are passed to git before the command name and
+      # arguments. For example, in `git --git-dir /path/to/git/dir version`, the
+      # global options are %w[--git-dir /path/to/git/dir].
+      #
+      # @example
+      #   global_opts = %w[--git-dir /path/to/git/dir]
+      #   cli = Git::CommandLine::Capturing.new({}, '/usr/bin/git', global_opts, Logger.new(nil))
+      #   cli.global_opts #=> %w[--git-dir /path/to/git/dir]
+      #
+      # @return [Array<String>]
+      #
+      attr_reader :global_opts
+
+      # @attribute [r] logger
+      #
+      # The logger to use for logging git commands and results
+      #
+      # @example
+      #   logger = Logger.new(nil)
+      #   cli = Git::CommandLine::Capturing.new({}, '/usr/bin/git', [], logger)
+      #   cli.logger == logger #=> true
+      #
+      # @return [Logger]
+      #
+      attr_reader :logger
+
+      private
+
+      # Merge caller-supplied options into `defaults` and raise if any unknown keys are present
+      #
+      # @param defaults [Hash] the allowed keys and their default values (e.g. RUN_OPTION_DEFAULTS)
+      #
+      # @param options_hash [Hash] caller-supplied options
+      #
+      # @return [Hash] defaults with any supplied values overridden
+      #
+      # @raise [ArgumentError] if options_hash contains keys not present in defaults
+      #
+      # @api private
+      #
+      def merge_and_validate_options(defaults, options_hash)
+        merged = defaults.merge(options_hash)
+        extra = merged.keys - defaults.keys
+        raise ArgumentError, "Unknown options: #{extra.join(', ')}" if extra.any?
+
+        merged
+      end
+
+      # Merge the instance-level env with any per-call overrides in options_hash[:env]
+      #
+      # @param options_hash [Hash] options that may include an :env override
+      #
+      # @return [Hash{String => String, nil}]
+      #
+      # @api private
+      #
+      def merged_env(options_hash)
+        env.merge(options_hash[:env] || {})
+      end
+
+      # Yield to a block that calls ProcessExecuter and translate any ProcessExecuter
+      # errors to their ruby-git equivalents
+      #
+      # @raise [ArgumentError] in place of ProcessExecuter::ArgumentError
+      #
+      # @raise [Git::Error] in place of ProcessExecuter::SpawnError (binary not found or
+      #   failed to launch)
+      #
+      # @raise [Git::ProcessIOError] in place of ProcessExecuter::ProcessIOError
+      #
+      # @return [Object] the return value of the block
+      #
+      # @api private
+      #
+      def run_process_executer
+        yield
+      rescue ProcessExecuter::ArgumentError => e
+        raise ::ArgumentError, e.message
+      rescue ProcessExecuter::SpawnError => e
+        raise Git::Error, e.message, cause: e.cause
+      rescue ProcessExecuter::ProcessIOError => e
+        raise Git::ProcessIOError, e.message, cause: e.cause
+      end
+
+      # Build the git command line from the available sources to send to `Process.spawn`
+      #
+      # @param args [Array<String>] command-line arguments to append after global options
+      #
+      # @return [Array<String>]
+      #
+      # @raise [ArgumentError] if any element of args is itself an Array
+      #
+      # @api private
+      #
+      def build_git_cmd(args)
+        raise ArgumentError, 'The args array can not contain an array' if args.any?(Array)
+
+        [binary_path, *global_opts, *args].map(&:to_s)
+      end
+
+      # Log the result of a git command at info/debug level
+      #
+      # @param result [ProcessExecuter::Result] the raw process result
+      #
+      # @param command [Array<String>] the full command that was run
+      #
+      # @param processed_out [String] the post-processed stdout string
+      #
+      # @param processed_err [String] the post-processed stderr string
+      #
+      # @return [void]
+      #
+      # @api private
+      #
+      def log_result(result, command, processed_out, processed_err)
+        logger.info { "#{command} exited with status #{result}" }
+        logger.debug { "stdout:\n#{processed_out.inspect}\nstderr:\n#{processed_err.inspect}" }
+      end
+
+      # Build a {Git::CommandLine::Result} and raise on timeout, signal, or failure
+      #
+      # @param command [Array<String>] the full command that was run
+      #
+      # @param result [ProcessExecuter::Result] the raw process result
+      #
+      # @param processed_out [String] processed stdout string
+      #
+      # @param processed_err [String] processed stderr string
+      #
+      # @param timeout [Numeric, nil] the timeout value (for error context)
+      #
+      # @param raise_on_failure [Boolean] whether to raise on non-zero exit status
+      #
+      # @return [Git::CommandLine::Result]
+      #
+      # @raise [Git::TimeoutError] if the command timed out
+      #
+      # @raise [Git::SignaledError] if the command was terminated by a signal
+      #
+      # @raise [Git::FailedError] if the command failed and raise_on_failure is true
+      #
+      # @api private
+      #
+      # rubocop:disable Metrics/ParameterLists
+      def command_line_result(command, result, processed_out, processed_err, timeout, raise_on_failure)
+        Git::CommandLine::Result.new(command, result, processed_out, processed_err).tap do |processed_result|
+          raise Git::TimeoutError.new(processed_result, timeout) if result.timed_out?
+
+          raise Git::SignaledError, processed_result if result.signaled?
+
+          raise Git::FailedError, processed_result if raise_on_failure && !result.success?
+        end
+      end
+      # rubocop:enable Metrics/ParameterLists
+    end
+  end
+end

data/lib/git/command_line/capturing.rb

@@ -0,0 +1,249 @@
+# frozen_string_literal: true
+
+require 'git/command_line'
+
+module Git
+  module CommandLine
+    # Executes a git command and captures both stdout and stderr in memory
+    #
+    # {Git::CommandLine::Capturing} is the buffering strategy: it calls
+    # `ProcessExecuter.run_with_capture`, which reads all subprocess output into
+    # `String` objects before returning.  Use this class (via
+    # {Git::Lib#command_capturing}) for the vast majority of git subcommands whose
+    # output fits comfortably in memory.
+    #
+    # {Git::CommandLine::Streaming} is the complementary strategy for commands
+    # (such as `cat-file -p <blob>`) whose stdout may be too large to buffer.
+    #
+    # @example
+    #   capturing = Git::CommandLine::Capturing.new(
+    #     {}, '/usr/bin/git', %w[--git-dir /repo/.git], Logger.new($stdout)
+    #   )
+    #   result = capturing.run('log', '--oneline', '-5')
+    #   result.stdout   # => "abc1234 Initial commit\n..."
+    #   result.stderr   # => ""
+    #
+    # @see Git::Lib#command_capturing
+    #
+    # @see Git::CommandLine::Streaming
+    #
+    class Capturing < Git::CommandLine::Base
+      # Default options accepted by {#run}
+      #
+      # @api private
+      RUN_OPTION_DEFAULTS = {
+        in: nil,
+        out: nil,
+        err: nil,
+        chdir: nil,
+        timeout: nil,
+        raise_on_failure: true,
+        env: {},
+        normalize: false,
+        chomp: false,
+        merge: false
+      }.freeze
+
+      # Execute a git command, capture stdout and stderr, and return the result
+      #
+      # Non-option command-line arguments to pass to git. If you collect the
+      # arguments in an array, splat the array into the parameter list.
+      #
+      # NORMALIZATION
+      #
+      # The command output is returned as a Unicode string containing the binary
+      # output from the command.  If the binary output is not valid UTF-8, the
+      # output will cause problems because the encoding will be invalid.
+      #
+      # Normalization is a process that tries to convert the binary output to a
+      # valid UTF-8 string.  It uses the `rchardet` gem to detect the encoding of
+      # the binary output and then converts it to UTF-8.
+      #
+      # Normalization is not enabled by default.  Pass `normalize: true` to enable
+      # it. When enabled, normalization is applied to both stdout and stderr in
+      # the returned result object, regardless of the `out:` or `err:` options.
+      # Only the captured in-memory strings are normalized; any external IO you
+      # provide will receive the raw subprocess output.
+      #
+      # @example Run a command and return the output
+      #   result = capturing.run('version')
+      #   result.stdout #=> "git version 2.39.1\n"
+      #
+      # @example The args array should be splatted into the parameter list
+      #   args = %w[log -n 1 --oneline]
+      #   result = capturing.run(*args)
+      #   result.stdout #=> "f5baa11 beginning of Ruby/Git project\n"
+      #
+      # @example Run a command and return the chomped output
+      #   result = capturing.run('version', chomp: true)
+      #   result.stdout #=> "git version 2.39.1"
+      #
+      # @example Run a command without normalizing the output
+      #   capturing.run('version', normalize: false) #=> "git version 2.39.1\n"
+      #
+      # @example Capture stdout in a temporary file
+      #   require 'tempfile'
+      #   Tempfile.create('git') do |file|
+      #     capturing.run('version', out: file)
+      #     file.rewind
+      #     file.read #=> "git version 2.39.1\n"
+      #   end
+      #
+      # @example Capture stderr in a StringIO object
+      #   require 'stringio'
+      #   stderr = StringIO.new
+      #   begin
+      #     capturing.run('log', 'nonexistent-branch', err: stderr)
+      #   rescue Git::FailedError => e
+      #     stderr.string #=> "unknown revision or path not in the working tree.\n"
+      #   end
+      #
+      # @param options_hash [Hash] the options to pass to the command
+      #
+      # @option options_hash [IO, nil] :in the IO object to use as stdin for the
+      #   command, or nil to inherit the parent process stdin.  Must be a real IO
+      #   object with a file descriptor (not StringIO).
+      #
+      # @option options_hash [#write, nil] :out the object to write stdout to, or
+      #   nil to capture stdout in the returned result.
+      #
+      #   If this is a `StringIO` object, `stdout_writer.string` will be returned.
+      #
+      #   In general, only specify a `stdout_writer` when you want to redirect
+      #   stdout to a file or other `#write`-responding object.  The default
+      #   behaviour returns the command output.
+      #
+      # @option options_hash [#write, nil] :err the object to write stderr to, or
+      #   nil to capture stderr in the returned result.
+      #
+      # @option options_hash [Boolean] :normalize (false) whether to normalize the
+      #   encoding of stdout and stderr output
+      #
+      # @option options_hash [Boolean] :chomp (false) whether to chomp both stdout
+      #   and stderr output
+      #
+      # @option options_hash [Boolean] :merge (false) whether to merge stdout and
+      #   stderr in the returned string
+      #
+      # @option options_hash [String, nil] :chdir the directory to run the command in
+      #
+      # @option options_hash [Numeric, nil] :timeout the maximum seconds to wait for
+      #   the command to complete.  Zero means no timeout.  A timeout kills the
+      #   process via `SIGKILL` and raises {Git::TimeoutError}.
+      #
+      # @option options_hash [Boolean] :raise_on_failure (true) whether to raise
+      #   {Git::FailedError} on non-zero exit status.
+      #   {Git::TimeoutError} and {Git::SignaledError} are always raised regardless.
+      #
+      # @option options_hash [Hash] :env ({}) additional environment variable
+      #   overrides for this command.  String keys map to String values (to set) or
+      #   `nil` (to unset).
+      #
+      # @return [Git::CommandLineResult] the result of the command
+      #
+      # @raise [ArgumentError] if `args` contains an array or an unknown option is
+      #   passed
+      #
+      # @raise [Git::SignaledError] if the command was terminated by an uncaught signal
+      #
+      # @raise [Git::FailedError] if the command returned a non-zero exit status
+      #
+      # @raise [Git::ProcessIOError] if an exception was raised while collecting
+      #   subprocess output
+      #
+      # @raise [Git::TimeoutError] if the command times out
+      #
+      def run(*, **options_hash)
+        options = merge_and_validate_options(RUN_OPTION_DEFAULTS, options_hash)
+
+        result = execute(*, **options)
+        process_result(result, options)
+      end
+
+      private
+
+      # @return [ProcessExecuter::ResultWithCapture] the process result with captured output
+      #
+      # @api private
+      def execute(*args, **options_hash)
+        git_cmd = build_git_cmd(args)
+        options = execute_options(**options_hash)
+        run_process_executer do
+          ProcessExecuter.run_with_capture(merged_env(options_hash), *git_cmd, **options)
+        end
+      end
+
+      # Build the ProcessExecuter options hash for a capturing run
+      #
+      # @return [Hash]
+      #
+      # @api private
+      def execute_options(**options_hash)
+        chdir = options_hash[:chdir] || :not_set
+        timeout_after = options_hash[:timeout]
+        merge_output = options_hash[:merge] || false
+
+        { chdir:, timeout_after:, merge_output:, raise_errors: false }.tap do |options|
+          redirect_options(options_hash).each { |k, v| options[k] = v }
+        end
+      end
+
+      # Extract non-nil redirect options (`:in`, `:out`, `:err`) from options_hash
+      #
+      # @return [Hash]
+      #
+      # @api private
+      def redirect_options(options_hash)
+        %i[in out err].filter_map do |key|
+          val = options_hash[key]
+          [key, val] unless val.nil?
+        end.to_h
+      end
+
+      # Post-process and return the stdout/stderr strings from the captured result,
+      # then log and raise on failure if required.
+      #
+      # @param result [ProcessExecuter::ResultWithCapture] the raw result
+      #
+      # @param options [Hash] the merged run options
+      #
+      # @return [Git::CommandLineResult]
+      #
+      # @raise [Git::FailedError] if the command failed and raise_on_failure is true
+      #
+      # @raise [Git::SignaledError] if the command was signaled
+      #
+      # @raise [Git::TimeoutError] if the command timed out
+      #
+      # @api private
+      def process_result(result, options)
+        command = result.command
+        processed_out, processed_err = post_process_output(result, options[:normalize], options[:chomp])
+        log_result(result, command, processed_out, processed_err)
+        command_line_result(
+          command, result, processed_out, processed_err, options[:timeout], options[:raise_on_failure]
+        )
+      end
+
+      # Normalize and/or chomp the raw stdout and stderr strings.
+      #
+      # @param result [ProcessExecuter::ResultWithCapture] the raw result
+      #
+      # @param normalize [Boolean]
+      #
+      # @param chomp [Boolean]
+      #
+      # @return [Array<String>] two-element array: [processed_stdout, processed_stderr]
+      #
+      # @api private
+      def post_process_output(result, normalize, chomp)
+        [result.stdout, result.stderr].map do |raw_output|
+          output = raw_output.dup
+          output = output.lines.map { |l| Git::EncodingUtils.normalize_encoding(l) }.join if normalize
+          output.chomp! if chomp
+          output
+        end
+      end
+    end
+  end
+end