squared 0.5.4 → 0.5.6

data/lib/squared/workspace/project/git.rb

@@ -74,7 +74,7 @@ module Squared
         @revdoc = JSON.parse(@revfile.read) if @revfile.exist?
       rescue StandardError => e
         @revfile = nil
-        warn log_message(Logger::WARN, e, pass: true) if @warning
+        warn log_message(Logger::WARN, e, pass: true)
         self
       else
         @revdoc = {} unless @revdoc.is_a?(Hash)
@@ -304,9 +304,9 @@ module Squared
           include Rake::DSL
 
           def populate(ws, **)
-            return if ws.series.exclude?(:pull, true)
+            return if ws.series.exclude?(:pull, true) || ws.size == 1
 
-            namespace(ws.task_name('git')) do |ns|
+            namespace ws.task_name('git') do |ns|
               ws.format_desc(all = ws.task_join(ns.scope.path, 'all'), 'stash|rebase|autostash?,depend?')
               task 'all' do |_, args|
                 args = args.to_a
@@ -358,7 +358,7 @@ module Squared
           'restore' => %i[source staged worktree].freeze,
           'rev' => %i[commit build output].freeze,
           'show' => %i[format oneline textconv].freeze,
-          'stash' => %i[push pop apply branch drop clear list].freeze,
+          'stash' => %i[push pop apply branch drop clear list all].freeze,
           'submodule' => %i[status update branch url sync].freeze,
           'switch' => %i[branch create detach].freeze,
           'tag' => %i[add sign delete list].freeze
@@ -503,10 +503,11 @@ module Squared
                     end
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
-                                                              when :push then 'pathspec*'
+                                                              when :push then 'pathspec*,:'
                                                               when :branch then 'name,stash?|:'
-                                                              when :clear, :list then nil
-                                                              else 'stash?|:' end)
+                                                              when :clear, :list, :all then nil
+                                                              else 'stash?|:'
+                                                              end)
                     task flag do |_, args|
                       stash flag, args.to_a
                     end
@@ -626,12 +627,12 @@ module Squared
                       format_desc action, flag, 'ref,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
-                        if commit
-                          args = args.extras
-                        else
-                          commit, opts = choice_commit(values: ['Options'])
-                          args = OptionPartition.strip(opts)
-                        end
+                        args = if commit
+                                 args.extras
+                               else
+                                 commit, opts = choice_commit(values: ['Options'])
+                                 OptionPartition.strip(opts)
+                               end
                         checkout(flag, args, commit: commit)
                       end
                     when :detach
@@ -755,7 +756,8 @@ module Squared
                                                          when 'h', 'hard' then ['hard']
                                                          when 's', 'soft' then ['soft']
                                                          when 'n', 'N' then ['mixed', 'N']
-                                                         else ['mixed'] end)
+                                                         else ['mixed']
+                                                         end)
                         end
                         print_success if success?(reset(flag, args, commit: commit))
                       end
@@ -804,28 +806,28 @@ module Squared
                     when :branch
                       format_desc action, flag, 'upstream,branch?=HEAD,opts*'
                       task flag, [:upstream] do |_, args|
-                        if (upstream = args.upstream)
-                          args = args.extras
-                        else
-                          upstream, opts = choice_refs('Choose upstream branch', values: ['Options'])
-                          args = OptionPartition.strip(opts)
-                        end
+                        args = if (upstream = args.upstream)
+                                 args.extras
+                               else
+                                 upstream, opts = choice_refs('Choose upstream branch', values: ['Options'])
+                                 OptionPartition.strip(opts)
+                               end
                         rebase(flag, args, upstream: upstream)
                       end
                     when :onto
                       format_desc action, flag, 'ref,upstream,branch?=HEAD'
                       task flag, [:commit, :upstream, :branch] do |_, args|
                         commit = commithead args.commit
-                        if commit
-                          upstream = param_guard(action, flag, args: args, key: :upstream)
-                          branch = args.branch
-                          args = []
-                        else
-                          commit = choice_refs 'Choose "onto" branch'
-                          target, opts = choice_commit(multiple: 2, values: ['Options'], reflog: false)
-                          branch, upstream = target
-                          args = OptionPartition.strip(opts)
-                        end
+                        args = if commit
+                                 upstream = param_guard(action, flag, args: args, key: :upstream)
+                                 branch = args.branch
+                                 []
+                               else
+                                 commit = choice_refs 'Choose "onto" branch'
+                                 target, opts = choice_commit(multiple: 2, values: ['Options'], reflog: false)
+                                 branch, upstream = target
+                                 OptionPartition.strip(opts)
+                               end
                         rebase(flag, args, commit: commit, upstream: upstream, branch: branch)
                       end
                     when :commit, :'no-commit'
@@ -889,13 +891,13 @@ module Squared
                       format_desc action, flag, 'ref,opts*,pathspec*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
-                        if commit
-                          args = args.extras
-                        else
-                          commit, opts, files = choice_commit(values: ['Options', ['Pathspec', true]])
-                          args = OptionPartition.strip(opts)
-                          files = files&.shellsplit
-                        end
+                        args = if commit
+                                 args.extras
+                               else
+                                 commit, opts, files = choice_commit(values: ['Options', ['Pathspec', true]])
+                                 files = files&.shellsplit
+                                 OptionPartition.strip(opts)
+                               end
                         restore(flag, args, commit: commit, files: files)
                       end
                     when :staged, :worktree
@@ -921,7 +923,8 @@ module Squared
                     before = case flag
                              when :blame then 'file'
                              when :mv then 'source+,destination'
-                             when :revert then 'commit+' end
+                             when :revert then 'commit+'
+                             end
                     format_desc(action, flag, 'opts*', before: before, after: case flag
                                                                               when :add
                                                                                 'pathspec*,pattern*'
@@ -956,43 +959,9 @@ module Squared
         def pull(flag = nil, opts = [], sync: invoked_sync?('pull', flag), remote: nil, hint: nil)
           cmd, opts = git_session('pull', opts: opts)
           cmd << '--autostash' if option('autostash')
-          case flag
-          when :rebase
+          if flag == :rebase
             cmd << '--rebase'
-          when :all
-            unless git_spawn('status -s -z --untracked-files=all').empty?
-              if confirm('Stash local changes?', 'Y')
-                git_spawn 'stash push --keep-index --quiet'
-              elsif !(force = confirm('Force checkout?', 'N'))
-                return
-              end
-            end
-            op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, no: OPT_GIT[:no][:pull])
-            reg = if op.empty?
-                    []
-                  else
-                    opts = opts.reject { |val| op.extras.include?(val) }
-                    matchmap op
-                  end
-            session_done op.target
-            heads = []
-            cur = nil
-            foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
-              line.chomp!
-              cur ||= line.delete_prefix!('* ')
-              heads << line if matchany?(line, reg)
-            end
-            raise_error('head not found', hint: 'for-each-ref') unless cur
-            opts << 'ff-only' if opts.empty? && !option('ff-only', equals: '0')
-            (heads.dup << cur).each_with_index do |branch, index|
-              next unless (index < heads.size && cur != branch) || index == heads.size
-
-              git_spawn 'switch --quiet', force && '--force', shell_quote(branch)
-              pull(nil, opts, sync: false, hint: branch) if heads.include?(branch)
-            end
-            return
           else
-            cmd << '--autostash' if flag == :autostash
             option('rebase', ignore: false) do |val|
               cmd << case val
                      when '0', 'false'
@@ -1001,10 +970,47 @@ module Squared
                        VAL_GIT[:rebase][:value].include?(val) ? basic_option('rebase', val) : '--rebase'
                      end
             end
+            case flag
+            when :all
+              unless git_spawn('status -s -z --untracked-files=all').empty?
+                if confirm('Stash local changes?', 'Y')
+                  git_spawn 'stash push --keep-index --quiet'
+                elsif !(force = confirm('Force checkout?', 'N'))
+                  return
+                end
+                printsucc
+              end
+              op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, no: OPT_GIT[:no][:pull])
+              reg = if op.empty?
+                      []
+                    else
+                      opts = op.uniq(opts)
+                      matchmap op
+                    end
+              session_done op.target
+              heads = []
+              cur = nil
+              foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
+                line.chomp!
+                cur ||= line.delete_prefix!('* ')
+                heads << line if matchany?(line, reg)
+              end
+              raise_error('head not found', hint: 'for-each-ref') unless cur
+              opts << 'ff-only' if opts.empty? && !option('ff-only', equals: '0')
+              (heads.dup << cur).each_with_index do |branch, index|
+                next unless (index < heads.size && cur != branch) || index == heads.size
+
+                git_spawn 'switch --quiet', force && '--force', shell_quote(branch)
+                pull(nil, opts, sync: false, hint: branch) if heads.include?(branch)
+              end
+              return
+            when :autostash
+              cmd << '--autostash'
+            end
           end
           append_pull(opts, OPT_GIT[:pull] + OPT_GIT[:fetch][:pull],
                       no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull], remote: remote, flag: flag, from: :pull)
-          source(sync: sync, sub: if verbose
+          source(sync: sync, sub: if stdout?
                                     [
                                       { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: color(:red), index: 4 },
                                       { pat: /^(.+)(\|\s+\d+\s+)(\++)(.*)$/, styles: color(:green), index: 3 }
@@ -1033,6 +1039,10 @@ module Squared
             cmd << upstream
             append_head branch
           else
+            unless gitpath('REBASE_HEAD').exist?
+              puts log_message(Logger::INFO, name, 'no rebase in progress', hint: command) if stdout?
+              return
+            end
             return unless VAL_GIT[:rebase][:send].include?(command)
 
             cmd << "--#{command}"
@@ -1086,6 +1096,10 @@ module Squared
 
         def stash(flag = nil, opts = [], sync: invoked_sync?('stash', flag))
           if flag
+            if flag == :all
+              opts << 'include-untracked'
+              flag = :push
+            end
             cmd, opts = git_session('stash', flag, opts: opts)
             list = OPT_GIT[:stash][:common] + OPT_GIT[:stash].fetch(flag, [])
             if flag == :list
@@ -1095,6 +1109,7 @@ module Squared
             op = OptionPartition.new(opts, list, cmd, project: self, no: no, first: flag == :push ? matchpathspec : nil)
             case flag
             when :push
+              op.append?('message', readline('Enter message', force: true), force: true) if op.remove(':')
               append_pathspec op.extras
             when :pop, :apply, :drop, :branch
               if op.remove(':')
@@ -1158,7 +1173,7 @@ module Squared
             end
             append_pathspec
           end
-          if verbose
+          if stdout?
             r = color(:red)
             g = color(:green)
             sub = if session_arg?('short')
@@ -1211,7 +1226,7 @@ module Squared
           if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
-              if verbose
+              if stdout?
                 if (since = workspace.rev_timesince(name, 'build'))
                   puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: "#{since} ago")
                 else
@@ -1276,7 +1291,6 @@ module Squared
             append_option('track', equals: true)
             cmd << (create ? quote_option(create, branch) : branch) << commit
           when :track
-
             cmd << quote_option(branch.delete_prefix!('^') ? 'B' : 'b', branch) if branch
             cmd << '--track' << shell_quote(origin)
           when :detach
@@ -1360,15 +1374,14 @@ module Squared
             op << '--no-index'
             append_pathspec(refs, parent: true)
           else
+            op << '--merge-base' if option('merge-base')
             case flag
             when :view
-              op << '--merge-base' if option('merge-base')
               op.merge(range)
             when :between, :contain
               op.delete('--merge-base')
               op.add_quote(range.join(flag == :between ? '..' : '...'))
             else
-              op << '--merge-base' if option('merge-base')
               op.add_quote(branch) if branch
               if !index.empty?
                 if op.arg?('cached')
@@ -1415,7 +1428,6 @@ module Squared
           cmd, opts = git_session('add', opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:add], cmd, project: self, first: matchpathspec)
           op << '--verbose' if verbose
-          dryrun = dryrun?
           format = '%(if)%(HEAD)%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
           git_spawn 'fetch --no-tags --quiet'
           foreachref('heads', format: format).each do |line|
@@ -1424,16 +1436,16 @@ module Squared
             branch, origin, hint = line.split('...')
             if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
               raise_error('work tree is not usable', hint: hint[1..-2])
-            elsif origin.empty?
+            elsif !origin || origin.empty?
               return nil if pass
-              break if dryrun
+              break if dryrun?
 
               unless (origin = option('upstream', prefix: 'git', ignore: false))
                 if (origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false))
                   git_spawn 'branch', quote_option('set-upstream-to', origin)
-                else
-                  origin = readline('Enter an upstream', force: true)
+                  break
                 end
+                origin = readline('Enter an upstream', force: true)
               end
               raise_error('missing remote name', hint: origin) unless origin.include?('/')
               upstream = true
@@ -1447,7 +1459,7 @@ module Squared
           end
           co = git_session('commit', options: false)
           pu = git_output 'push', upstream && '--set-upstream'
-          if dryrun
+          if dryrun?
             op.delete('--dry-run')
             co << '--dry-run'
             pu << '--dry-run'
@@ -1462,12 +1474,19 @@ module Squared
           pu.merge(repotrack(origin, branch))
           puts if pass
           source op
-          source co
-          source pu
+          if amend || !git_spawn('diff --cached --name-only --no-color').empty? || dryrun?
+            source co
+            source pu
+          elsif banner?
+            puts 'Nothing to commit'
+          elsif stdout?
+            puts log_message(Logger::INFO, name, 'nothing to commit', hint: flag)
+          end
         end
 
         def merge(flag, opts = [], command: nil, branch: nil)
           cmd, opts = git_session('merge', opts: opts)
+          display = false
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
@@ -1480,11 +1499,16 @@ module Squared
               append_commit(*op.extras)
             end
           else
+            unless gitpath('MERGE_HEAD').exist?
+              puts log_message(Logger::INFO, name, 'no merge in progress', hint: command) if stdout?
+              return
+            end
             return unless VAL_GIT[:merge][:send].include?(command)
 
             cmd << "--#{command}"
+            display = command == 'abort'
           end
-          source
+          print_success if success?(source, display)
         end
 
         def branch(flag = nil, opts = [], refs: [], ref: nil, target: nil, remote: nil)
@@ -1521,10 +1545,8 @@ module Squared
             end
             force, list = refs.partition { |val| val.start_with?(/[~^]/) }
             force.each do |val|
-              dr = val[0, 2]
-              d = dr.include?('^') ? '-D' : '-d'
-              r = '-r' if dr.include?('~')
-              source git_output('branch', d, r, shell_quote(val.sub(/^[~^]+/, '')))
+              r = '-r' if val.delete!('~')
+              source git_output('branch', val.delete!('^') ? '-D' : '-d', r, shell_quote(val))
             end
             return if list.empty?
 
@@ -1532,8 +1554,9 @@ module Squared
             append_value list
             remote = nil
           when :move, :copy
-            flag = "-#{flag.to_s[0]}"
-            cmd << (option('force', 'f') ? flag.upcase : flag)
+            s = "-#{flag.to_s[0]}"
+            s.upcase! if option('force', 'f')
+            cmd << s
             refs.compact.each { |val| cmd << shell_quote(val) }
             stdout = true
           when :current
@@ -1553,12 +1576,12 @@ module Squared
             list_result(ret, 'branches', from: from)
             return
           else
-            head = git_spawn('rev-parse --abbrev-ref HEAD').chomp
-            if head.empty?
+            if (head = git_spawn('rev-parse --abbrev-ref HEAD').chomp).empty?
               ret = 0
             else
               git_spawn 'fetch --all --prune --quiet' if option('sync')
-              out, banner, from = source(cmd << '-vv --no-abbrev --list', io: true)
+              cmd << '-vv --no-abbrev --list'
+              out, banner, from = source(io: true)
               ret = write_lines(out, grep: [/^\*\s+#{Regexp.escape(head)}\s/], banner: banner, first: true) do |line|
                 next line if stdin?
 
@@ -1624,10 +1647,13 @@ module Squared
           op = OptionPartition.new(opts, OPT_GIT[:submodule].fetch(flag, []), cmd, project: self)
           case flag
           when :branch, :url
+            op.adjoin("set-#{flag}")
             op << '--'
             op.add_path(path) if path
             op.add_quote(url) if url
           else
+            op.adjoin(flag)
+            op << '--recursive' if option('recursive', 'r')
             op.splice(path: true)
           end
           source
@@ -1652,19 +1678,15 @@ module Squared
             source(banner: false)
             return
           when :oneline
-            format = 'oneline'
+            format = flag.to_s
           end
-          if format
-            case (val = format.downcase)
-            when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
-              cmd << basic_option('format', val)
-            else
-              if format.start_with?(/t?format:/) || format.include?('%')
-                cmd << quote_option('pretty', format)
-              else
-                opts << format
-              end
-            end
+          case format
+          when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
+            cmd << basic_option('format', format)
+          when /(?:^t?format:|%)/
+            cmd << quote_option('pretty', format)
+          else
+            opts << format if format
           end
           op = OptionPartition.new(opts, OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff], cmd,
                                    project: self,
@@ -1721,7 +1743,8 @@ module Squared
                                    project: self, no: OPT_GIT[:no][flag], first: case flag
                                                                                  when :blame, :revert
                                                                                    nil
-                                                                                 else matchpathspec end)
+                                                                                 else matchpathspec
+                                                                                 end)
           case flag
           when :blame
             raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
@@ -1756,8 +1779,7 @@ module Squared
             end
             return source(git_session('status -s'), banner: false) unless append_pathspec(op.extras)
 
-            verbose = flag == :add && !op.arg?('verbose')
-            print_success if success?(source) && verbose
+            print_success if success?(source, flag == :add && !op.arg?('verbose'))
             return
           when :mv
             refs = projectmap op.extras
@@ -1784,7 +1806,7 @@ module Squared
         private
 
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
-                   multiple: false, hint: nil, from: nil, **kwargs)
+                   multiple: false, hint: nil, from: nil, send: :system, **kwargs)
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           if io && banner == false
             from = nil
@@ -1792,10 +1814,10 @@ module Squared
           else
             banner = nil if banner && (multiple || !banner?)
             if cmd.respond_to?(:done)
-              if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
+              if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
                 from = :"git:#{from}"
               end
-              banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
+              banner &&= cmd.temp { |val| val.start_with?(/--(?:work-tree|git-dir)/) }
             end
             from = nil if from == false
           end
@@ -1824,7 +1846,7 @@ module Squared
               end
             elsif !kwargs[:sub] && (sync || (!exception && !stderr))
               print_item banner unless multiple
-              ret = shell(cmd, exception: exception)
+              ret = shell(cmd, name: send, exception: exception)
             else
               require 'open3'
               if stderr
@@ -1882,7 +1904,7 @@ module Squared
         def list_result(size, type, grep: [], action: 'found', from: nil)
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
-          elsif verbose
+          elsif stdout?
             styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
@@ -1957,11 +1979,9 @@ module Squared
               when 'rebase'
                 op << basic_option($1, $2) if VAL_GIT[:rebase][:value].include?($2)
               when 'shallow-since'
-                next unless (val = Date.parse($2))
-
-                op << quote_option($1, val.strftime('%F %T'))
+                op.append?($1) { Date.parse($2)&.strftime('%F %T') }
               when 'recurse-submodules'
-                op << basic_option($1, $2) unless op.arg?('recurse-submodules')
+                op.append?($1, $2, type: :basic)
               when 'refspec'
                 refspec << shell_escape($2, quote: true)
               end
@@ -1971,7 +1991,7 @@ module Squared
               op.errors << opt
             end
           end
-          op << '--verbose' if (flag || from == :fetch) && verbose && !op.arg?('quiet')
+          op << '--verbose' if (flag || from == :fetch) && stdout? && !op.arg?('quiet')
           if remote
             op.append(remote, delim: true)
             if (val = option('refspec', target: target, strict: true))
@@ -1984,7 +2004,7 @@ module Squared
             op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
             return
           elsif option('all')
-            cmd << '--all'
+            op << '--all'
           end
           op.clear(errors: true, subject: flag.to_s) if flag
         end
@@ -2072,8 +2092,17 @@ module Squared
           git_session(*cmd, main: false, options: false, **kwargs)
         end
 
-        def git_spawn(*cmd, stdout: true)
-          source(cmd.first.is_a?(Set) ? cmd.first : git_output(*cmd), io: true, banner: false, stdout: stdout)
+        def git_spawn(*cmd, exception: true, io: true, sync: true, stdout: true, banner: false, **kwargs)
+          kwargs[:send] = if sync
+                            :system
+                          else
+                            exception = false
+                            io = false
+                            stdout = false
+                            :spawn
+                          end
+          source(cmd.first.is_a?(Set) ? cmd.first : git_output(*cmd), exception: exception, io: io, sync: sync,
+                                                                      stdout: stdout, banner: banner, **kwargs)
         end
 
         def dryrun?(*, target: @session, **)
@@ -2088,8 +2117,8 @@ module Squared
           target.include?('--quiet') || (target.include?('-q') && stripext(target.first) == 'git')
         end
 
-        def gitpath
-          path + '.git'
+        def gitpath(*args)
+          path.join('.git', *args)
         end
 
         def repotrack(origin, branch, quote: true)