avm-git 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 131f6f492e367fdd20b348f8e4c4f64d55c32d1308c48c467d62b55375dbfb31
-  data.tar.gz: 6820cfd26ffe40a553a83a7bb4aca84f7be278f4bb84cfa6ac0f68cb7510de82
+  metadata.gz: 4dbbeaecd11ef3df5fcdc6467875ee5e4cbd4bbf0ec16878c56ea0b0996b726b
+  data.tar.gz: 257081841d148f3195076725ab146b4f12d47fc143db3b7e6bd7467840a2a481
 SHA512:
-  metadata.gz: f8717c186d4c5e7114df2845ceafe4de60ae1517fc513c70e7df2c89116f88bbb3d25cb15f44625e0fef56fabf1c89cffd869aaafa921fd36b0a4cc2ddb8111b
-  data.tar.gz: 77fdbbfedfee9b927d5def461963bef3cc5684bcb52f9c1527b7f5606ba8044931cf38de149707a167f30f43d28f293413af13345f37c4a7ac5f67aaa1742569
+  metadata.gz: 1c40bfcfd621c1dc6137dcece97b85e5158b32419b529ec721aebd7eeb622e8692fbf8229fee08216d148592e6bbc1344043ce7bee2ae8ac06235ad920f7a900
+  data.tar.gz: 71ca230ad521db192dbe47c981ccbd22fc40154aeaaabc8b32b512fb51716783159f55fb171cb71c8e000a245edf833053b374ebac6e91b81f9df45912c43c10

data/lib/avm/git/scms/git/changed_file.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/scms/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :path
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/changed_files.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFiles
+          enable_method_class
+          common_constructor :scm
+
+          # @return [Avm::Git::Scms::Git::ChangedFile]
+          def result
+            scm.git_repo.dirty_files.map do |dirty_file|
+              ::Avm::Git::Scms::Git::ChangedFile.new(scm, dirty_file.path)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/commit.rb

@@ -15,11 +15,18 @@ module Avm
           delegate :git_repo, to: :git_scm
           delegate :id, to: :git_commit
 
+          FIXUP_SUBJECT_PATTERN = /\Afixup\!/.freeze
+
           # @return [Array<Pathname>]
           def changed_files
             git_commit.changed_files.map { |cf| cf.path.to_pathname }
           end
 
+          # @return [Boolean]
+          def fixup?
+            FIXUP_SUBJECT_PATTERN.match?(git_commit.subject)
+          end
+
           # @param other [Avm::Git::Scms::Git::Commit]
           # @return [Avm::Git::Scms::Git::Commit]
           def merge_with(other)
@@ -43,6 +50,9 @@ module Avm
             %w[.gitrepo .gitmodules].any? { |file| file.include?(path.basename.to_path) }
           end
 
+          # @return [String]
+          delegate :subject, to: :git_commit
+
           private
 
           def validate_clean_and_head

data/lib/avm/git/scms/git/commits.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Commits
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit(source)
+            if source.is_a?(::Avm::Git::Scms::Git::Commit)
+              return source if source.git_repo == git_repo
+
+              raise 'Not same Git repository'
+            end
+            git_repo.commitize(source).if_present do |v|
+              ::Avm::Git::Scms::Git::Commit.new(self, v)
+            end
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit_dirty(message = nil)
+            return nil unless git_repo.dirty?
+
+            git_repo.command('add', '.').execute!
+            git_repo.command(
+              'commit', '-m',
+              message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)
+            ).execute!
+            head_commit
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit_if_change(message = nil)
+            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
+            tracker.start
+            yield
+            tracker.stop
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def head_commit
+            commit(git_repo.head)
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def reset_and_commit(commit_to_reset, message)
+            git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
+            commit_dirty(message)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/interval.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/scms/interval'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Interval < ::Avm::Scms::Interval
+          def initialize(scm, from, to)
+            super(scm, from, to)
+            self.from = scm.commit(from)
+            self.to = scm.commit(to)
+          end
+
+          # @return [Array<Avm::Git::Scms::Git::Commit>]
+          def commits
+            scm.git_repo.command('log', '--pretty=format:%H', git_commit_interval).execute!
+               .each_line.map { |sha1| scm.commit(sha1.strip) }
+          end
+
+          # @return [String]
+          def git_commit_interval
+            [from.id, to.id].join('..')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/milestones.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Milestones
+          BASE_COMMIT_REFERENCE = 'origin/master'
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def current_milestone_base_commit
+            commit(BASE_COMMIT_REFERENCE)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/run_commit.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class RunCommit
+          enable_method_class
+
+          common_constructor :scm, :commit_info
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def result
+            reset
+            add_paths
+            commit
+
+            scm.head_commit
+          end
+
+          protected
+
+          def add_path(path)
+            scm.git_repo.command(
+              *(path.exist? ? ['add'] : ['rm', '-f']),
+              path.relative_path_from(scm.path)
+            ).execute!
+          end
+
+          def add_paths
+            commit_info.paths.each { |path| add_path(path) }
+          end
+
+          def commit
+            scm.git_repo.command('commit', *commit_args).execute!
+          end
+
+          # @return [Array<String>]
+          def commit_args
+            r = commit_info.fixup.if_present([]) { |v| ['--fixup', v.id] }
+            r += commit_info.message.if_present([]) { |v| ['--message', v] }
+            return r if r.any?
+
+            raise 'Argument list is empty'
+          end
+
+          def reset
+            scm.git_repo.command('reset', '--soft', 'HEAD').execute!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git.rb

@@ -8,7 +8,7 @@ module Avm
   module Git
     module Scms
       class Git < ::Avm::Scms::Base
-        require_sub __FILE__
+        require_sub __FILE__, include_modules: true
         include ::Comparable
 
         COMMIT_DIRTY_DEFAULT_MESSAGE = 'Dirty files.'
@@ -17,44 +17,15 @@ module Avm
           git_repo <=> other.git_repo
         end
 
-        # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commit(source)
-          if source.is_a?(::Avm::Git::Scms::Git::Commit)
-            return source if source.git_repo == self
-
-            raise 'Not same Git repository'
-          end
-          git_repo.commitize(source).if_present do |v|
-            ::Avm::Git::Scms::Git::Commit.new(self, v)
-          end
-        end
-
-        # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commit_dirty(message = nil)
-          return nil unless git_repo.dirty?
-
-          git_repo.command('add', '.').execute!
-          git_repo.command('commit', '-m',
-                           message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
-          commit(git_repo.head)
-        end
-
-        # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commit_if_change(message = nil)
-          tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
-          tracker.start
-          yield
-          tracker.stop
-        end
-
         def git_repo
           @git_repo ||= ::EacGit::Local.new(path)
         end
 
-        # @return [Avm::Git::Scms::Git::Commit]
-        def reset_and_commit(commit_to_reset, message)
-          git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
-          commit_dirty(message)
+        # @param from [Avm::Git::Scms::Git::Commit]
+        # @param to [Avm::Git::Scms::Git::Commit]
+        # @return [Avm::Git::Scms::Git::Interval]
+        def interval(from, to)
+          ::Avm::Git::Scms::Git::Interval.new(self, from, to)
         end
 
         # @return [Enumerable<Avm::Git::Scms::GitSubrepo>]

data/lib/avm/git/scms/git_subrepo.rb

@@ -8,7 +8,8 @@ module Avm
   module Git
     module Scms
       class GitSubrepo < ::Avm::Scms::Base
-        delegate :commit_if_change, to: :parent_scm
+        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
+                 :head_commit, :run_commit, to: :parent_scm
 
         def update
           git_subrepo.command('clean').execute!

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.10.1'
+    VERSION = '0.11.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.59'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.59'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.110'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.110.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.110'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.110.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -121,21 +127,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm/git.rb
-- lib/avm/git/auto_commit/commit_info.rb
-- lib/avm/git/auto_commit/rules.rb
-- lib/avm/git/auto_commit/rules/base.rb
-- lib/avm/git/auto_commit/rules/last.rb
-- lib/avm/git/auto_commit/rules/manual.rb
-- lib/avm/git/auto_commit/rules/new.rb
-- lib/avm/git/auto_commit/rules/nth.rb
-- lib/avm/git/auto_commit/rules/unique.rb
-- lib/avm/git/auto_commit_path.rb
-- lib/avm/git/auto_commit_path/ruby.rb
 - lib/avm/git/commit.rb
 - lib/avm/git/commit/class_methods.rb
 - lib/avm/git/commit/diff_tree_line.rb
 - lib/avm/git/commit/file.rb
-- lib/avm/git/file_auto_fixup.rb
 - lib/avm/git/issue.rb
 - lib/avm/git/issue/complete.rb
 - lib/avm/git/issue/complete/commits.rb
@@ -182,9 +177,15 @@ files:
 - lib/avm/git/scms.rb
 - lib/avm/git/scms/git.rb
 - lib/avm/git/scms/git/change_tracker.rb
+- lib/avm/git/scms/git/changed_file.rb
+- lib/avm/git/scms/git/changed_files.rb
 - lib/avm/git/scms/git/commit.rb
 - lib/avm/git/scms/git/commit/deploy.rb
 - lib/avm/git/scms/git/commit/deploy_methods.rb
+- lib/avm/git/scms/git/commits.rb
+- lib/avm/git/scms/git/interval.rb
+- lib/avm/git/scms/git/milestones.rb
+- lib/avm/git/scms/git/run_commit.rb
 - lib/avm/git/scms/git_subrepo.rb
 - lib/avm/git/scms/provider.rb
 - lib/avm/git/subrepo_check.rb

data/lib/avm/git/auto_commit/commit_info.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Git
-    module AutoCommit
-      class CommitInfo
-        enable_immutable
-
-        immutable_accessor :fixup, :message
-
-        def git_commit_args
-          r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
-          r += message.if_present([]) { |v| ['--message', v] }
-          return r if r.any?
-
-          raise 'Argument list is empty'
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules/base.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        class Base
-          class << self
-            def keys
-              [long_key, short_key]
-            end
-
-            def long_key
-              name.demodulize.variableize
-            end
-
-            def short_key
-              long_key[0, 1]
-            end
-          end
-
-          def with_file(file)
-            self.class.const_get('WithFile').new(self, file)
-          end
-
-          class WithFile
-            common_constructor :rule, :file
-
-            def new_commit_info
-              ::Avm::Git::AutoCommit::CommitInfo.new
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules/last.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/auto_commit/rules/base'
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        class Last < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            def commit_info
-              file.commits.last.if_present { |v| new_commit_info.fixup(v) }
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/auto_commit/rules/base'
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        class Manual < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            enable_speaker
-
-            COMMIT_FORMAT = '%h - %s (%cr)'
-            SKIP_OPTION = 's'
-
-            def commit_info
-              return nil unless file.commits.any?
-
-              commits_banner
-              input('Which commit?', list: commits_by_position).if_present do |v|
-                new_commit_info.fixup(v)
-              end
-            end
-
-            def commits_banner
-              file.commits.each_with_index do |commit, _index|
-                infov "    #{commit.position}", format_commit(commit)
-              end
-              infov "    #{SKIP_OPTION}", 'skip'
-            end
-
-            def commits_by_position
-              (file.commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]])
-                .to_h
-            end
-
-            def format_commit(commit)
-              commit.format(COMMIT_FORMAT)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules/new.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/auto_commit/rules/base'
-require 'avm/git/auto_commit_path'
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        class New < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            def auto_commit_path
-              ::Avm::Git::AutoCommitPath.new(file.git, file.path)
-            end
-
-            def commit_info
-              new_commit_info.message(auto_commit_path.commit_message)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules/nth.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/auto_commit/rules/base'
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        class Nth < ::Avm::Git::AutoCommit::Rules::Base
-          SHORT_KEY = 't'
-
-          class << self
-            def short_key
-              SHORT_KEY
-            end
-          end
-
-          common_constructor :number do
-            self.number = number.to_i
-          end
-
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            def commit_info
-              file.commits(number - 1).if_present { |v| new_commit_info.fixup(v) }
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules/unique.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/auto_commit/rules/base'
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        class Unique < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            def commit_info
-              return nil unless file.commits.count == 1
-
-              new_commit_info.fixup(file.commits.first)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit/rules.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-::EacRubyUtils.require_sub __FILE__
-
-module Avm
-  module Git
-    module AutoCommit
-      module Rules
-        RULES_CLASSES = %w[last manual new nth unique]
-                        .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
-
-        class << self
-          def parse(string)
-            parts = string.split(':')
-
-            klass = rule_class_by_key(parts.shift)
-            klass.new(*parts)
-          end
-
-          def rule_class_by_key(key)
-            RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
-              raise("Rule not find with key \"#{key}\" (Available: " +
-                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit_path/ruby.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Git
-    class AutoCommitPath
-      module Ruby
-        RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-        def ruby_class_name
-          RUBY_CLASS_NAME_PATTERNS.each do |pattern|
-            pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
-          end
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/auto_commit_path.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Git
-    class AutoCommitPath
-      require_sub __FILE__, include_modules: true
-      common_constructor :git, :path do
-        self.path = path.to_pathname
-      end
-
-      def class_name
-        ruby_class_name || relative_path.to_path
-      end
-
-      def commit_message
-        r = class_name
-        r += ': remove' unless path.file?
-        r + '.'
-      end
-
-      def relative_path
-        path.expand_path.relative_path_from(git.root_path.expand_path)
-      end
-    end
-  end
-end

data/lib/avm/git/file_auto_fixup.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/auto_commit/commit_info'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Git
-    class FileAutoFixup
-      enable_speaker
-      enable_simple_cache
-      enable_listable
-
-      common_constructor :git, :path, :rules do
-        self.path = path.to_pathname.expand_path(git.root_path)
-      end
-
-      COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
-
-      def git_relative_path
-        path.to_pathname.relative_path_from(git.root_path)
-      end
-
-      def run
-        start_banner
-        run_commit || warn("No rule returned commit information for \"#{path}\"")
-      end
-
-      private
-
-      def commit_args
-        commit_info.if_present([], &:git_commit_args) + ['--', git_relative_path]
-      end
-
-      def commit_info_uncached
-        rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
-      end
-
-      def start_banner
-        infov 'Path', path
-        infov '  Commits found', commits.count
-      end
-
-      def run_commit
-        return false if commit_info.blank?
-
-        infov '  Commit arguments', ::Shellwords.join(commit_args)
-        run_git_add_and_commit
-        success '  Commited'
-        true
-      end
-
-      def run_git_add_and_commit
-        git.execute!('reset', '--soft', 'HEAD')
-        if path.exist?
-          git.execute!('add', git_relative_path)
-        else
-          git.execute!('rm', '-f', git_relative_path)
-        end
-        git.execute!('commit', *commit_args)
-      end
-
-      def commits_uncached
-        git.execute!('log', '--pretty=format:%H', COMMITS_SEARCH_INTERVAL, '--', path)
-           .each_line.map { |sha1| ::Avm::Git::Commit.new(git, sha1.strip) }
-           .reject { |commit| commit.subject.start_with?('fixup!') }
-           .each_with_index.map { |commit, index| CommitDelegator.new(commit, index) }
-      end
-
-      class CommitDelegator < ::SimpleDelegator
-        attr_reader :index
-
-        def initialize(commit, index)
-          super(commit)
-          @index = index
-        end
-
-        def position
-          index + 1
-        end
-      end
-    end
-  end
-end