git 4.3.2 → 5.0.0.beta.1

data/lib/git/commands/rev_parse.rb

@@ -0,0 +1,297 @@
+# frozen_string_literal: true
+
+require 'git/commands/base'
+
+module Git
+  module Commands
+    # Implements the `git rev-parse` command
+    #
+    # Picks out and massages parameters for other git commands. Most commonly
+    # used to resolve a revision specifier (branch name, tag, abbreviated SHA)
+    # to its full object name. Also provides repository metadata queries and
+    # argument classification for porcelain scripts.
+    #
+    # The `--parseopt` and `--sq-quote` operation modes are excluded because
+    # they require stdin interaction or provide no value in a Ruby library.
+    #
+    # @example Resolve HEAD to its full SHA
+    #   rev_parse = Git::Commands::RevParse.new(execution_context)
+    #   result = rev_parse.call('HEAD', verify: true)
+    #
+    # @example Query the repository top-level directory
+    #   rev_parse = Git::Commands::RevParse.new(execution_context)
+    #   result = rev_parse.call(show_toplevel: true)
+    #
+    # @example List all branch refs
+    #   rev_parse = Git::Commands::RevParse.new(execution_context)
+    #   result = rev_parse.call(branches: true)
+    #
+    # @note `arguments` block audited against https://git-scm.com/docs/git-rev-parse/2.53.0
+    #
+    # @see https://git-scm.com/docs/git-rev-parse git-rev-parse
+    #
+    # @api private
+    #
+    class RevParse < Git::Commands::Base
+      arguments do
+        literal 'rev-parse'
+
+        # Filtering
+        flag_option :revs_only
+        flag_option :no_revs
+        flag_option :flags, negatable: true
+
+        # Output
+        value_option :default
+        value_option :prefix
+        flag_option :verify
+        flag_option %i[quiet q]
+        flag_option :sq
+        flag_or_value_option :short, inline: true
+        flag_option :not
+        flag_or_value_option :abbrev_ref, inline: true
+        flag_option :symbolic
+        flag_option :symbolic_full_name
+        value_option :output_object_format, inline: true
+
+        # Objects
+        flag_option :all
+        flag_or_value_option :branches, inline: true
+        flag_or_value_option :tags, inline: true
+        flag_or_value_option :remotes, inline: true
+        value_option :glob, inline: true
+        value_option :exclude, inline: true, repeatable: true
+        value_option :exclude_hidden, inline: true
+        value_option :disambiguate, inline: true
+
+        # Files
+        flag_option :local_env_vars
+        value_option :path_format, inline: true, repeatable: true
+        flag_option :git_dir
+        flag_option :absolute_git_dir
+        flag_option :git_common_dir
+        flag_option :is_inside_git_dir
+        flag_option :is_inside_work_tree
+        flag_option :is_bare_repository
+        flag_option :is_shallow_repository
+        value_option :resolve_git_dir
+        value_option :git_path
+        flag_option :show_cdup
+        flag_option :show_prefix
+        flag_option :show_toplevel
+        flag_option :show_superproject_working_tree
+        flag_option :shared_index_path
+        flag_or_value_option :show_object_format, inline: true
+        flag_option :show_ref_format
+
+        # Date conversion
+        value_option %i[since after], inline: true
+        value_option %i[until before], inline: true
+
+        execution_option :chdir
+
+        end_of_options as: '--end-of-options'
+
+        # Positional arguments (revisions, file paths, or mixed).
+        #
+        # In git rev-parse, `--` separates verified arguments from those
+        # echoed back without verification. Because this operand is after
+        # the end_of_options boundary, callers can freely include `--` and
+        # hyphen-prefixed values (e.g. branch names starting with `-`).
+        operand :args, repeatable: true
+      end
+
+      # @!method call(*, **)
+      #
+      #   @overload call(*args, **options)
+      #
+      #     Execute the `git rev-parse` command
+      #
+      #     @param args [Array<String>] zero or more revision specifiers,
+      #       object names, or file paths to parse. Include `'--'` to
+      #       separate verified arguments from those echoed back without
+      #       verification, e.g. `call('HEAD', '--', 'file.txt')`.
+      #
+      #     @param options [Hash] command options
+      #
+      #     @option options [Boolean, nil] :revs_only (nil) do not output flags
+      #       and parameters not meant for `git rev-list`
+      #
+      #     @option options [Boolean, nil] :no_revs (nil) do not output flags and
+      #       parameters meant for `git rev-list`
+      #
+      #     @option options [Boolean, nil] :flags (nil) do not output non-flag
+      #       parameters (`--flags`)
+      #
+      #     @option options [Boolean, nil] :no_flags (nil) do not output flag
+      #       parameters (`--no-flags`)
+      #
+      #     @option options [String] :default (nil) use this value if no
+      #       parameter is given by the user
+      #
+      #     @option options [String] :prefix (nil) behave as if invoked from
+      #       this subdirectory of the working tree
+      #
+      #     @option options [Boolean, nil] :verify (nil) verify that exactly one
+      #       parameter is provided and that it can be resolved to an object
+      #
+      #     @option options [Boolean, nil] :quiet (nil) do not output an error
+      #       message if the first argument is not a valid object name;
+      #       exit with non-zero status silently
+      #
+      #       Only meaningful with `:verify`.
+      #
+      #       Alias: :q
+      #
+      #     @option options [Boolean, nil] :sq (nil) output a single line
+      #       properly quoted for shell consumption
+      #
+      #     @option options [Boolean, String, nil] :short (nil) shorten the
+      #       object name to a unique prefix
+      #
+      #       When `true`, emits `--short` (git default length). When a
+      #       String, emits `--short=<length>`.
+      #
+      #     @option options [Boolean, nil] :not (nil) prefix object names with
+      #       `^` and strip `^` from names that already have one
+      #
+      #     @option options [Boolean, String, nil] :abbrev_ref (nil) output a
+      #       non-ambiguous short name of the object
+      #
+      #       When `true`, emits `--abbrev-ref`. When a String (`"strict"`
+      #       or `"loose"`), emits `--abbrev-ref=<mode>`.
+      #
+      #     @option options [Boolean, nil] :symbolic (nil) output object names
+      #       in a form as close to the original input as possible
+      #
+      #     @option options [Boolean, nil] :symbolic_full_name (nil) like
+      #       `:symbolic` but omit non-ref input and show full refnames
+      #
+      #     @option options [String] :output_object_format (nil) translate
+      #       object identifiers to the specified format
+      #
+      #       Accepted values are `"sha1"`, `"sha256"`, and `"storage"`.
+      #
+      #     @option options [Boolean, nil] :all (nil) show all refs found in
+      #       `refs/`
+      #
+      #     @option options [Boolean, String, nil] :branches (nil) show all
+      #       branches
+      #
+      #       When `true`, emits `--branches`. When a String, emits
+      #       `--branches=<pattern>`.
+      #
+      #     @option options [Boolean, String, nil] :tags (nil) show all tags
+      #
+      #       When `true`, emits `--tags`. When a String, emits
+      #       `--tags=<pattern>`.
+      #
+      #     @option options [Boolean, String, nil] :remotes (nil) show all
+      #       remote-tracking branches
+      #
+      #       When `true`, emits `--remotes`. When a String, emits
+      #       `--remotes=<pattern>`.
+      #
+      #     @option options [String] :glob (nil) show all refs matching
+      #       the shell glob pattern
+      #
+      #     @option options [String, Array<String>] :exclude (nil) exclude
+      #       refs matching the glob pattern from the next `--all`,
+      #       `--branches`, `--tags`, `--remotes`, or `--glob`
+      #
+      #     @option options [String] :disambiguate (nil) show every object
+      #       whose name begins with the given prefix
+      #
+      #     @option options [String] :exclude_hidden (nil) do not include
+      #       refs that would be hidden by the specified protocol
+      #
+      #       Accepted values are `"fetch"`, `"receive"`, and `"uploadpack"`.
+      #       Affects the next `--all` or `--glob` and is cleared after
+      #       processing them.
+      #
+      #     @option options [Boolean, nil] :local_env_vars (nil) list the
+      #       `GIT_*` environment variables local to the repository
+      #
+      #     @option options [String, Array<String>] :path_format (nil) control
+      #       whether paths output by subsequent path-related options are
+      #       absolute or relative
+      #
+      #       Accepted values are `"absolute"` and `"relative"`. May be
+      #       given multiple times; each instance affects the arguments
+      #       that follow it on the command line.
+      #
+      #     @option options [Boolean, nil] :git_dir (nil) show `$GIT_DIR` if
+      #       defined, otherwise show the path to the `.git` directory
+      #
+      #     @option options [Boolean, nil] :absolute_git_dir (nil) like
+      #       `:git_dir` but always output the canonicalized absolute path
+      #
+      #     @option options [Boolean, nil] :git_common_dir (nil) show
+      #       `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`
+      #
+      #     @option options [Boolean, nil] :is_inside_git_dir (nil) print
+      #       `"true"` when the current working directory is below the
+      #       repository directory, `"false"` otherwise
+      #
+      #     @option options [Boolean, nil] :is_inside_work_tree (nil) print
+      #       `"true"` when inside the work tree, `"false"` otherwise
+      #
+      #     @option options [Boolean, nil] :is_bare_repository (nil) print
+      #       `"true"` when the repository is bare, `"false"` otherwise
+      #
+      #     @option options [Boolean, nil] :is_shallow_repository (nil) print
+      #       `"true"` when the repository is shallow, `"false"` otherwise
+      #
+      #     @option options [String] :resolve_git_dir (nil) check if the
+      #       given path is a valid repository or a gitfile that points at
+      #       one and print the location
+      #
+      #     @option options [String] :git_path (nil) resolve
+      #       `"$GIT_DIR/<path>"` taking relocation variables into account
+      #
+      #     @option options [Boolean, nil] :show_cdup (nil) show the path of
+      #       the top-level directory relative to the current directory
+      #
+      #     @option options [Boolean, nil] :show_prefix (nil) show the path of
+      #       the current directory relative to the top-level directory
+      #
+      #     @option options [Boolean, nil] :show_toplevel (nil) show the
+      #       absolute path of the top-level directory of the working tree
+      #
+      #     @option options [Boolean, nil] :show_superproject_working_tree (nil)
+      #       show the absolute path of the root of the superproject's
+      #       working tree if the current repository is a submodule
+      #
+      #     @option options [Boolean, nil] :shared_index_path (nil) show the
+      #       path to the shared index file in split index mode
+      #
+      #     @option options [Boolean, String, nil] :show_object_format (nil)
+      #       show the object format (hash algorithm) used for the
+      #       repository
+      #
+      #       When `true`, emits `--show-object-format` (defaults to
+      #       `"storage"`). When a String (`"storage"`, `"input"`, or
+      #       `"output"`), emits `--show-object-format=<mode>`.
+      #
+      #     @option options [Boolean, nil] :show_ref_format (nil) show the
+      #       reference storage format used for the repository
+      #
+      #     @option options [String] :since (nil) parse the date string
+      #       and output the corresponding `--max-age=` parameter
+      #
+      #       Alias: :after
+      #
+      #     @option options [String] :until (nil) parse the date string
+      #       and output the corresponding `--min-age=` parameter
+      #
+      #       Alias: :before
+      #
+      #     @return [Git::CommandLineResult] the result of calling
+      #       `git rev-parse`
+      #
+      #     @raise [ArgumentError] if unsupported options are provided
+      #
+      #     @raise [Git::FailedError] if git exits with a non-zero status
+    end
+  end
+end

data/lib/git/commands/revert/abort.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'git/commands/base'
+
+module Git
+  module Commands
+    module Revert
+      # Implements `git revert --abort` to cancel an in-progress revert sequence
+      #
+      # Cancels the in-progress revert and restores the branch to the state it
+      # was in before the `git revert` sequence started.
+      #
+      # @example Abort an in-progress revert
+      #   abort_cmd = Git::Commands::Revert::Abort.new(execution_context)
+      #   abort_cmd.call
+      #
+      # @note `arguments` block audited against https://git-scm.com/docs/git-revert/2.53.0
+      #
+      # @see Git::Commands::Revert
+      #
+      # @see https://git-scm.com/docs/git-revert git-revert
+      #
+      # @api private
+      #
+      class Abort < Git::Commands::Base
+        arguments do
+          literal 'revert'
+          literal '--abort'
+        end
+
+        # @!method call(*, **)
+        #
+        #   @overload call()
+        #
+        #     Cancel the in-progress revert and restore the branch to its
+        #     pre-revert state
+        #
+        #     @return [Git::CommandLineResult] the result of calling
+        #       `git revert --abort`
+        #
+        #     @raise [Git::FailedError] if git exits with a non-zero exit status
+      end
+    end
+  end
+end

data/lib/git/commands/revert/continue.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'git/commands/base'
+
+module Git
+  module Commands
+    module Revert
+      # Implements `git revert --continue` to resume after resolving conflicts
+      #
+      # After the user has resolved a conflict and staged the changes, the
+      # revert session can be continued with this command.
+      #
+      # @example Resume a revert session after resolving conflicts
+      #   continue_cmd = Git::Commands::Revert::Continue.new(execution_context)
+      #   continue_cmd.call
+      #
+      # @note `arguments` block audited against https://git-scm.com/docs/git-revert/2.53.0
+      #
+      # @see Git::Commands::Revert
+      #
+      # @see https://git-scm.com/docs/git-revert git-revert
+      #
+      # @api private
+      #
+      class Continue < Git::Commands::Base
+        arguments do
+          literal 'revert'
+          literal '--continue'
+          flag_option %i[edit e], negatable: true
+        end
+
+        # @!method call(*, **)
+        #
+        #   @overload call(**options)
+        #
+        #     Resume the in-progress revert after conflicts have been resolved
+        #
+        #     @param options [Hash] command options
+        #
+        #     @option options [Boolean, nil] :edit (nil) open the editor for the
+        #       commit message (`--edit`)
+        #
+        #       Alias: `:e`
+        #
+        #     @option options [Boolean, nil] :no_edit (nil) suppress the editor for
+        #       the commit message (`--no-edit`)
+        #
+        #     @return [Git::CommandLineResult] the result of calling
+        #       `git revert --continue`
+        #
+        #     @raise [ArgumentError] if unsupported options are provided
+        #
+        #     @raise [Git::FailedError] if git exits with a non-zero exit status
+      end
+    end
+  end
+end

data/lib/git/commands/revert/quit.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'git/commands/base'
+
+module Git
+  module Commands
+    module Revert
+      # Implements `git revert --quit` to forget an in-progress revert sequence
+      #
+      # Clears the sequencer state without restoring the branch, leaving the
+      # working tree and index in their current state. If no revert is in
+      # progress, this is a no-op and still succeeds.
+      #
+      # @example Forget an in-progress revert session
+      #   quit_cmd = Git::Commands::Revert::Quit.new(execution_context)
+      #   quit_cmd.call
+      #
+      # @note `arguments` block audited against https://git-scm.com/docs/git-revert/2.53.0
+      #
+      # @see Git::Commands::Revert
+      #
+      # @see https://git-scm.com/docs/git-revert git-revert
+      #
+      # @api private
+      #
+      class Quit < Git::Commands::Base
+        arguments do
+          literal 'revert'
+          literal '--quit'
+        end
+
+        # @!method call(*, **)
+        #
+        #   @overload call()
+        #
+        #     Clear any in-progress revert sequencer state, leaving the
+        #     working tree as-is. If no revert is in progress, this is a
+        #     no-op and still succeeds.
+        #
+        #     @return [Git::CommandLineResult] the result of calling
+        #       `git revert --quit`
+        #
+        #     @raise [Git::FailedError] if git exits with a non-zero exit status
+      end
+    end
+  end
+end

data/lib/git/commands/revert/skip.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'git/commands/base'
+
+module Git
+  module Commands
+    module Revert
+      # Implements `git revert --skip` to skip the current commit in a sequence
+      #
+      # Skips the current commit and continues applying the remaining commits
+      # in the revert sequence.
+      #
+      # @example Skip a conflicting commit during a revert sequence
+      #   skip_cmd = Git::Commands::Revert::Skip.new(execution_context)
+      #   skip_cmd.call
+      #
+      # @note `arguments` block audited against https://git-scm.com/docs/git-revert/2.53.0
+      #
+      # @see Git::Commands::Revert
+      #
+      # @see https://git-scm.com/docs/git-revert git-revert
+      #
+      # @api private
+      #
+      class Skip < Git::Commands::Base
+        arguments do
+          literal 'revert'
+          literal '--skip'
+        end
+
+        # @!method call(*, **)
+        #
+        #   @overload call()
+        #
+        #     Skip the current commit and continue with the remaining sequence
+        #
+        #     @return [Git::CommandLineResult] the result of calling
+        #       `git revert --skip`
+        #
+        #     @raise [Git::FailedError] if git exits with a non-zero exit status
+      end
+    end
+  end
+end

data/lib/git/commands/revert/start.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+require 'git/commands/base'
+
+module Git
+  module Commands
+    module Revert
+      # Implements `git revert` to create commits that undo prior changes
+      #
+      # Given one or more existing commits, reverts the changes introduced by
+      # those commits and records new commits that reverse them. This requires
+      # the working tree to be clean.
+      #
+      # @example Revert the most recent commit
+      #   revert = Git::Commands::Revert::Start.new(execution_context)
+      #   revert.call('HEAD')
+      #
+      # @example Revert a specific commit without committing
+      #   revert.call('abc123', no_commit: true)
+      #
+      # @example Revert a range of commits
+      #   revert.call('HEAD~3..HEAD~1')
+      #
+      # @example Revert a merge commit specifying the mainline parent
+      #   revert.call('abc123', mainline: 1)
+      #
+      # @note `arguments` block audited against https://git-scm.com/docs/git-revert/2.53.0
+      #
+      # @see Git::Commands::Revert
+      #
+      # @see https://git-scm.com/docs/git-revert git-revert
+      #
+      # @api private
+      #
+      class Start < Git::Commands::Base
+        arguments do
+          literal 'revert'
+
+          # Edit commit message (SYNOPSIS: [--[no-]edit])
+          flag_option %i[edit e], negatable: true
+
+          # Commit behavior (SYNOPSIS: [-n])
+          flag_option %i[no_commit n]
+
+          # Parent selection for merge commits (SYNOPSIS: [-m <parent-number>])
+          value_option %i[mainline m]
+
+          # Authorship (SYNOPSIS: [-s])
+          flag_option %i[signoff s], negatable: true
+
+          # GPG signing (SYNOPSIS: [-S[<keyid>]])
+          flag_or_value_option %i[gpg_sign S], negatable: true, inline: true
+
+          # Commit message cleanup
+          value_option :cleanup, inline: true
+
+          # Merge strategy
+          value_option :strategy, inline: true
+          value_option %i[strategy_option X], inline: true, repeatable: true
+
+          # Conflict resolution
+          flag_option :rerere_autoupdate, negatable: true
+
+          # Commit log message format
+          flag_option :reference
+
+          end_of_options
+
+          # Commits to revert
+          operand :commit, repeatable: true, required: true
+        end
+
+        # @!method call(*, **)
+        #
+        #   @overload call(*commit, **options)
+        #
+        #     Execute the git revert command
+        #
+        #     @param commit [Array<String>] one or more commit SHAs, refs, or
+        #       rev ranges to revert
+        #
+        #     @param options [Hash] command options
+        #
+        #     @option options [Boolean, nil] :edit (nil) open the editor for the
+        #       commit message (`--edit`)
+        #
+        #       Alias: `:e`
+        #
+        #     @option options [Boolean, nil] :no_edit (nil) suppress the editor for
+        #       the commit message (`--no-edit`)
+        #
+        #     @option options [Boolean, nil] :no_commit (nil) apply changes to index
+        #       and working tree without committing
+        #
+        #       Alias: `:n`
+        #
+        #     @option options [Integer, String] :mainline (nil) parent number (starting
+        #       from 1) identifying the mainline when reverting a merge commit
+        #
+        #       Alias: `:m`
+        #
+        #     @option options [Boolean, nil] :signoff (nil) add a `Signed-off-by`
+        #       trailer to the commit message (`--signoff`)
+        #
+        #       Alias: `:s`
+        #
+        #     @option options [Boolean, nil] :no_signoff (nil) suppress the
+        #       `Signed-off-by` trailer (`--no-signoff`)
+        #
+        #     @option options [Boolean, String, nil] :gpg_sign (nil) GPG-sign the
+        #       resulting commit (`--gpg-sign`)
+        #
+        #       When `true`, uses the default key. When a `String`, uses the
+        #       specified key ID. Alias: `:S`
+        #
+        #     @option options [Boolean, nil] :no_gpg_sign (nil) disable GPG signing
+        #       (`--no-gpg-sign`)
+        #
+        #     @option options [String] :cleanup (nil) commit message cleanup mode
+        #
+        #       Accepted values include `strip`, `whitespace`, `verbatim`,
+        #       `scissors`, and `default`. Emits `--cleanup=<mode>`.
+        #
+        #     @option options [String] :strategy (nil) merge strategy to use
+        #       (e.g., `'ort'`, `'recursive'`, `'resolve'`)
+        #
+        #       Emits `--strategy=<strategy>`.
+        #
+        #     @option options [String, Array<String>] :strategy_option (nil) pass
+        #       option(s) to the merge strategy (e.g., `'ours'`, `'theirs'`)
+        #
+        #       Can be a single value or an array for multiple `-X` flags.
+        #       Emits `--strategy-option=<option>`. Alias: `:X`
+        #
+        #     @option options [Boolean, nil] :rerere_autoupdate (nil) allow rerere to
+        #       update the index with the auto-resolved conflict result
+        #       (`--rerere-autoupdate`)
+        #
+        #     @option options [Boolean, nil] :no_rerere_autoupdate (nil) prevent rerere
+        #       from auto-updating the index (`--no-rerere-autoupdate`)
+        #
+        #     @option options [Boolean, nil] :reference (nil) use compact reference
+        #       format in the revert commit message instead of the full object name
+        #
+        #     @return [Git::CommandLineResult] the result of calling `git revert`
+        #
+        #     @raise [ArgumentError] if unsupported options are provided
+        #
+        #     @raise [Git::FailedError] if git exits with a non-zero exit status
+      end
+    end
+  end
+end

data/lib/git/commands/revert.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative 'revert/abort'
+require_relative 'revert/continue'
+require_relative 'revert/quit'
+require_relative 'revert/skip'
+require_relative 'revert/start'
+
+module Git
+  module Commands
+    # Commands for reverting commits via `git revert`
+    #
+    # This module contains command classes for starting a revert and managing
+    # in-progress revert sessions:
+    #
+    # - {Revert::Start} — revert one or more commits
+    # - {Revert::Continue} — resume after resolving conflicts (`--continue`)
+    # - {Revert::Skip} — skip the current commit (`--skip`)
+    # - {Revert::Abort} — abort the in-progress revert (`--abort`)
+    # - {Revert::Quit} — forget the in-progress revert (`--quit`)
+    #
+    # @api private
+    #
+    # @see https://git-scm.com/docs/git-revert git-revert documentation
+    #
+    module Revert
+    end
+  end
+end