squared 0.6.5 → 0.6.7

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

@@ -429,7 +429,7 @@ module Squared
                                                                       .sort { |a, b| b <=> a }
                                                                       .push('latest', 'system'),
                                                               accept: [accept_y('Confirm?')],
-                                                              values: 'Options', force: true)
+                                                              values: 'Options')
                                  OptionPartition.strip(opts)
                                end
                         asdf(flag, args, version: version)
@@ -537,7 +537,7 @@ module Squared
               end
               d = append_hash(d, target: []).join(' ') if d.is_a?(Hash)
               if a
-                cmd << [a, d, b].compact.join(' ')
+                cmd << [replace_bin(a), d, b].compact.join(' ')
               else
                 next unless respond_to?(:compose)
 
@@ -551,7 +551,7 @@ module Squared
             if cmd
               return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
 
-              cmd = as_get cmd, from
+              cmd = replace_bin as_get(cmd, from)
               opts = compose(opts, script: false) if opts && respond_to?(:compose)
               flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
               cmd = case opts
@@ -1158,7 +1158,7 @@ module Squared
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1249,7 +1249,7 @@ module Squared
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{"@#{proj.version}" if SEM_VER.match?(proj.version)}" }
           uniq = lambda do |name|
-            next [] unless (ret = data[name])
+            return [] unless (ret = data[name])
 
             ret.dup.each do |proj|
               next if proj.name == name
@@ -1358,13 +1358,7 @@ module Squared
               obj.enabled? ? [obj] : []
             else
               workspace.find(group: val, ref: val.to_sym)
-            end.sort do |a, b|
-              if a.parent == b
-                -1
-              else
-                b.parent == a ? 1 : 0
-              end
-            end.each do |proj|
+            end.sort.each do |proj|
               next if pass.include?(name = proj.name)
 
               if proj.graph? && !data.key?(name) && !root.include?(name)
@@ -1528,7 +1522,9 @@ module Squared
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
-          warn log_message(loglevel, *args, **kwargs) if warning?
+          return unless warning?
+
+          warn log_message(loglevel, *args, **kwargs)
         end
 
         def print_run(cmd, banner = true, verbose: nil, **)
@@ -1696,8 +1692,8 @@ module Squared
           msg.subhint(obj.is_a?(Numeric) ? "#{obj} #{title}" : message(title, obj.to_s))
         end
 
-        def append_repeat(flag, opts, target: @session)
-          opts.each { |val| target << shell_option(flag, val) }
+        def append_repeat(flag, opts, target: @session, **kwargs)
+          opts.each { |val| target << shell_option(flag, val, **kwargs) }
         end
 
         def append_hash(data, target: @session || [], build: false)
@@ -1722,6 +1718,8 @@ module Squared
               target << basic_option(key, val)
             when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
+            when Pathname
+              target << shell_option(key, val, escape: false)
             else
               target << shell_option(key, (val if val.is_a?(String)))
             end
@@ -1774,20 +1772,18 @@ module Squared
           return if list.empty?
 
           kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
-          [].tap do |ret|
-            list.flatten.each do |flag|
-              next unless (val = option(flag, target: target, **kwargs))
+          ret = []
+          list.flatten.each do |flag|
+            next unless (val = option(flag, target: target, **kwargs))
 
-              if no && val == '0'
-                flag = "no-#{flag}"
-                val = nil
-              end
-              ret << shell_option(flag, (val if equals), escape: escape, quote: quote, force: force)
+            if no && val == '0'
+              flag = "no-#{flag}"
+              val = nil
             end
-            next if ret.empty?
-
-            merge_list target, ret
+            ret << shell_option(flag, (val if equals), escape: escape, quote: quote, force: force)
           end
+          merge_list target, ret unless ret.empty?
+          ret
         end
 
         def append_nocolor(target: @session)
@@ -1870,6 +1866,13 @@ module Squared
           ret
         end
 
+        def replace_bin(val)
+          a, b = val.split(' ', 2)
+          return val if val.start_with?(/["']/) || a.include?(File::Separator)
+
+          [shell_bin(a), b].compact.join(' ')
+        end
+
         def parse_json(val, kind: Hash, hint: nil)
           ret = JSON.parse(val)
           raise_error 'invalid JSON'.subhint(kind.name), val, hint: hint if kind && !ret.is_a?(kind)
@@ -2003,10 +2006,15 @@ module Squared
           nil
         end
 
-        def command(*args)
-          return args.join(' && ') unless workspace.powershell?
-
-          "powershell.exe -Command #{shell_quote("& {#{args.join(' ; ')}}", option: false, double: true)}"
+        def command(*args, verbose: true)
+          out = unless verbose
+                  [">#{File::NULL}", '2>&1'].tap { |a| a.reverse if File::NULL == 'NUL' }.unshift('').join(' ')
+                end
+          if workspace.powershell?
+            "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\"#{out}"
+          else
+            args.map! { |val| "#{val}#{out}" }.join(' && ')
+          end
         end
 
         def relativepath(*list, all: false)
@@ -2117,7 +2125,11 @@ module Squared
           end
         end
 
-        def semgte?(val, other)
+        def semgte?(val, other = nil)
+          unless other
+            other = val
+            val = RUBY_VERSION
+          end
           semcmp(val, other) != 1
         end
 
@@ -2210,13 +2222,15 @@ module Squared
         end
 
         def pwd_set(pass: false, exception: self.exception, dryrun: false, from: nil)
-          pwd = Dir.pwd
-          return yield if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+          return yield if (path.to_s == Dir.pwd || pass == true) && (workspace.mri? || !workspace.windows?)
 
-          Dir.chdir path
-          yield.tap { Dir.chdir pwd }
+          pwd = Dir.pwd
+          Dir.chdir(path)
+          yield
         rescue StandardError => e
           on_error(e, from, exception: exception, dryrun: dryrun)
+        ensure
+          Dir.chdir(pwd) if pwd
         end
 
         def run_set(cmd, val = nil, opts: nil, global: false, **)

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

@@ -13,7 +13,7 @@ module Squared
           buildx: {
             common: %w[builder=b D|debug],
             build: %w[add-host=q annotation=q attest=q build-arg=qq build-context=qq cache-from=q cache-to=q
-                      cgroup-parent=b iidfile=p label=q a-file=p network=b no-cache-filter=b o|output=q platform=b
+                      cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q
                       q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
             bake: %w[print list=q set=q].freeze,
             shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
@@ -40,22 +40,21 @@ module Squared
                        rm t|tty use-api-socket add-host=q annotation=q a|attach=b blkio-weight=i blkio-weight-device=i
                        cap-add=b cap-drop=b cgroup-parent=b cgroupns=b cidfile=p device=q device-cgroup-rule=q
                        device-read-bps=q device-read-iops=q device-write-bps=q device-write-iops=q
-                       disable-content-trust=b? dns=q dns-option=q dns-search=q domainname=b entrypoint=q e|env=qq
-                       env-file=p expose=q gpus=q group-add=b health-cmd=q health-interval=b health-retries=i
-                       health-start-interval=q health-start-period=q health-timeout=q io-maxbandwidth=b io-maxiops=b
-                       ip=b ip6=q ipc=b isolation=b kernel-memory=b l|label=q label-file=q link=b link-local-ip=q
-                       log-driver=b log-opt=q mac-address=q m|memory=b memory-reservation=b memory-swap=n
-                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
-                       platform=b p|publish=q pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
-                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
-                       volume-driver=b volumes-from=b w|workdir=q].freeze,
-            run: %w[d|detach detach-keys=q hostname=q sig-proxy=b?].freeze,
+                       dns=q dns-option=q dns-search=q domainname=b entrypoint=q e|env=qq env-file=p expose=q gpus=q
+                       group-add=b health-cmd=q health-interval=b health-retries=i health-start-interval=q
+                       health-start-period=q health-timeout=q hostname=q io-maxbandwidth=b io-maxiops=b ip=b ip6=q ipc=b
+                       isolation=b l|label=q label-file=q link=b link-local-ip=q log-driver=b log-opt=q mac-address=q
+                       m|memory=b memory-reservation=b memory-swap=n memory-swappiness=n mount=qq name=b network=b
+                       network-alias=b oom-score-adj=b pid=b pids-limit=n platform=q p|publish=q pull=b restart=b
+                       runtime=b security-opt=q shm-size=b stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q
+                       ulimit=q u|user=b userns=b uts=b v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+            run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
-                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
+                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=n pids-limit=n
                        restart=q].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p u|user=e
                      w|workdir=q].freeze,
-            commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
+            commit: %w[no-pause a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q type=b].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
             stop: %w[s|signal=b t|timeout=i].freeze,
@@ -65,9 +64,9 @@ module Squared
           }.freeze,
           image: {
             ls: %w[a|all digests no-trunc q|quiet tree f|filter=q format=q].freeze,
-            push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
-            rm: %w[f|force no-prune platform=b].freeze,
-            save: %w[o|output=p platform=b].freeze
+            push: %w[a|all-tags platform=q q|quiet].freeze,
+            rm: %w[f|force no-prune platform=q].freeze,
+            save: %w[o|output=p platform=q].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
@@ -154,33 +153,34 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    cmd = docker_output(command, case command
+                    cmd = docker_output command, case command
                                                  when 'image', 'container', 'network'
                                                    'ls'
                                                  when 'compose'
                                                    'ps'
                                                  else
                                                    raise_error ArgumentError, 'unrecognized command', hint: command
-                                                 end)
+                                                 end
                     cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
-                    if has_value!(args, 's', 'standard')
-                      cols = data.first(data.index('CreatedAt'))
-                    else
-                      cols = []
-                      args.each do |val|
-                        if val =~ /^(\d+)$/
-                          cols << data[$1.to_i.pred]
-                        elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
-                          j = $1.to_i.pred
-                          k = $3.to_i - ($2 == '..' ? 2 : 1)
-                          cols.concat(data[j..k]) if k > j
-                        end
-                      end
-                      if cols.empty?
-                        cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
-                      end
-                    end
+                    cols = if has_value!(args, 's', 'standard')
+                             data.first(data.index('CreatedAt'))
+                           else
+                             [].tap do |out|
+                               args.each do |val|
+                                 if val =~ /^(\d+)$/
+                                   out << data[$1.to_i.pred]
+                                 elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
+                                   j = $1.to_i.pred
+                                   k = $3.to_i - ($2 == '..' ? 2 : 1)
+                                   out.concat(data[j..k]) if k > j
+                                 end
+                               end
+                               next unless out.empty?
+
+                               out.replace(choice_index('Select a column', data, multiple: true, attempts: 1))
+                             end
+                           end
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -417,7 +417,7 @@ module Squared
               lines = IO.popen(cmd.temp('--services')).map(&:strip).reject(&:empty?)
               return list_empty(hint: status) if lines.empty?
 
-              service = choice_index('Choose a service', lines, multiple: true, force: true, attempts: 1)
+              service = choice_index('Choose a service', lines, multiple: true, attempts: 1)
             end
             docker_session('compose', command, '--', *service)
           else
@@ -545,11 +545,12 @@ module Squared
             if opts.size == op.size
               index = 0
               name = nil
-              opts.reverse_each do |opt|
-                if (name = opt[/^name=["']?(.+?)["']?$/, 1])
-                  opts.delete(opt)
-                  break
-                end
+              opts.reverse_each do |val|
+                next unless (arg = OptionPartition.parse_arg!('name', val))
+
+                name = arg[1]
+                opts.delete(val)
+                break
               end
               list_image(:run, from: from) do |val|
                 container(:run, if name
@@ -732,21 +733,17 @@ module Squared
         end
 
         def append_tag(val, target: @session)
+          ver = option('version', target: target, ignore: false)
           case val
           when String
             split_escape val
-          when Array
-            val
           else
-            []
-          end.yield_self do |list|
-            ver = option('version', target: target, ignore: false)
-            list.each do |s|
-              s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
-              target << basic_option('tag', tagname(s))
-            end
-            target
+            Array(val)
+          end.each do |s|
+            s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
+            target << basic_option('tag', tagname(s))
           end
+          target
         end
 
         def filter_ps(flag, from = :'container:ps')
@@ -873,14 +870,12 @@ module Squared
                         "--format='table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}'"]
                      end
           lines = `#{docker_output(cmd)}`.lines
-          header = lines.shift
-          if lines.empty?
-            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
+          if lines.size <= 1
+            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0, 2].join(' ')}")
             return
           end
-          puts " #  #{header}"
+          puts " #  #{lines.shift}"
           multiple = false
-          parse = ->(val) { val.split(/\s+/)[0] }
           ctx = flag.to_s
           case flag
           when :run, :exec
@@ -915,7 +910,7 @@ module Squared
           else
             cmd << opts << '--'
           end
-          cmd.merge(Array(out).map! { |val| parse.call(val) })
+          cmd.merge(Array(out).map! { |val| val.split(/\s+/, 2).first })
           cmd << args
           success?(run(cmd), ctx.start_with?(/network|tag|save/))
         end

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

@@ -29,7 +29,7 @@ module Squared
             base = name.to_s
             each { |proj| repo << proj if !proj.parent && check.call(proj) }
           else
-            warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid') if warning
+            warn log_warn(name, subject: 'git', hint: 'invalid') if warning
             return self
           end
         end
@@ -86,7 +86,7 @@ module Squared
         @revdoc = JSON.parse(@revfile.read) if @revfile.exist?
       rescue StandardError => e
         @revfile = nil
-        warn log_message(Logger::WARN, e, pass: true)
+        warn log_warn(e, pass: true)
         self
       else
         @revdoc = {} unless @revdoc.is_a?(Hash)
@@ -142,7 +142,7 @@ module Squared
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue StandardError => e
         log&.debug e
-        warn log_message(Logger::WARN, e, pass: true) if warning?
+        warn log_warn(e, pass: true) if warning
       ensure
         @revlock = false
       end
@@ -580,17 +580,17 @@ module Squared
                           when '--'
                             grep << '--' if grep.empty?
                             break
-                          when 'a', 'all-match'
+                          when /^a(ll-match)?$/
                             opts << 'all-match'
-                          when 'in', 'invert-grep'
+                          when /^in(vert-grep)?$/
                             opts << 'invert-grep'
                           when 'i', 'E', 'F', 'P'
                             opts << last
                           else
-                            if last =~ /^(?:f(?:-ormat)?)=(.+)$/
+                            if last =~ /^(f(-ormat)?)=(.+)$/
                               opts.shift
                               opts << "format=#{$1}"
-                            elsif last =~ /^(?:max(?:-count)?)=(\d+)$/
+                            elsif last =~ /^(max(-count)?)=(\d+)$/
                               opts << "max-count=#{$1}"
                             else
                               grep << last
@@ -883,6 +883,8 @@ module Squared
                         rev_parse(flag, ref: ref, size: size)
                       end
                     when :build
+                      next unless build?
+
                       format_desc action, flag, 'opts*'
                       task flag do |_, args|
                         revbuild flag, args.to_a
@@ -1167,7 +1169,7 @@ module Squared
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
-                                   values: values, column: /^[^@]+@\{(\d+)}/, force: true)
+                                   values: values, column: /^[^@]+@\{(\d+)\}/)
                 if values
                   op.merge(out.reverse)
                 else
@@ -1276,9 +1278,7 @@ module Squared
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
               workspace.rev_timeutc(name, 'build') unless (since = workspace.rev_timesince(name, 'build'))
-              if stdout?
-                puts log_message(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since))
-              end
+              puts log_message(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since)) if stdout?
               return
             end
           end
@@ -1513,13 +1513,14 @@ module Squared
             append_pathspec op.extras
           end
           co = git_session('commit', options: false)
-          pu = git_output 'push', upstream && '--set-upstream'
+          pu = git_output 'push'
+          co << '--amend' if amend
+          pu << '--set-upstream' if upstream
           if dryrun?
-            op.delete('--dry-run')
+            op.adjoin('--dry-run')
             co << '--dry-run'
             pu << '--dry-run'
           end
-          co << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('edit', equals: '0')
@@ -1527,13 +1528,12 @@ module Squared
           end
           pu << '--force-with-lease' if amend
           pu.merge(repotrack(origin, branch))
-          puts if pass
           adding = git_spawn 'diff --name-only --no-color'
           source op
           cached = git_spawn 'diff --cached --name-only --no-color'
           if amend || !cached.empty? || dryrun?
             if adding.empty? && !cached.empty? && banner?
-              puts(cached.lines.map! { |val| "cached #{shell_quote(val.chomp)}" })
+              puts(cached.lines(chomp: true).map! { |val| "cached #{shell_quote(val)}" })
             end
             source co
             source pu
@@ -1553,7 +1553,8 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            op << "--#{flag}" << '--'
+            op << "--#{flag}"
+            op.delim
             if branch
               op << branch
               op.clear(pass: false)
@@ -1643,13 +1644,15 @@ module Squared
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               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|
+              first = workspace.size > 1
+              grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
+              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
                 next line if stdin?
 
-                data = line.sub(/^\*\s+/, '').split(/\s+/)
-                a = sub_style data[0], theme[:inline]
-                b = sub_style data[1], theme[:extra]
-                r = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2..-1].join(' '))
+                data = line.sub(/^\*?\s+/, '').split(/\s+/, 3)
+                a = sub_style(data[0], theme[:inline], styles: (:underline if !first && line.start_with?('*')))
+                b = commitstyle data[1]
+                r = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2])
                 if (r1 = r[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
                   write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, theme[:warn])}" }
                   r1 = $1
@@ -1657,7 +1660,7 @@ module Squared
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
-                [" Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
+                ["#{"\n" unless index == 0} Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
                   .compact
                   .join("\n")
               end
@@ -1690,7 +1693,7 @@ module Squared
                        basic_option 'track', track
                      end
             when :detach
-              cmd << "--#{flag}"
+              cmd << '--detach'
             end
             append_head commit
           end
@@ -1738,7 +1741,7 @@ module Squared
           case format
           when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
             cmd << basic_option('format', format)
-          when /(?:^t?format:|%)/
+          when /^t?format:|%/
             cmd << quote_option('pretty', format)
           else
             opts << format if format
@@ -1754,7 +1757,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << ((n = size.to_i) > 0 ? basic_option('short', [n, 5].max) : '--verify')
+            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref'
@@ -1823,15 +1826,14 @@ module Squared
               grep, pathspec = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !pathspec.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
-                files = [].tap do |out|
-                  status_data.each do |a, b|
-                    next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
+                files = []
+                status_data.each do |a, b|
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                    out << "#{sub_style(b, color(:red))} #{a}"
-                  end
+                  files << "#{sub_style(b, color(:red))} #{a}"
                 end
                 unless files.empty?
-                  files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
+                  files = choice_index('Select files', files, multiple: true, trim: /^\S+\s/,
                                                               accept: [accept_y('Add?')])
                 end
                 op.swap(pathspec + files)
@@ -1850,8 +1852,8 @@ module Squared
               if op.include?('--')
                 op.add_path(val)
               elsif op.exist?(val, glob: true)
-                op << '--'
-                op.add_path(val)
+                op.delim
+                  .add_path(val)
               else
                 op.add_quote(val)
               end
@@ -1951,7 +1953,7 @@ module Squared
           out = []
           data.each do |line|
             next if grep&.none? { |pat| pat.match?(line) }
-            next if block_given? && !(line = yield line)
+            next if block_given? && !(line = yield(line, ret))
 
             if loglevel
               log&.add loglevel, line
@@ -1993,16 +1995,24 @@ module Squared
           end
           args = []
           args << quote_option('sort', sort) if sort
-          args << shell_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          args << basic_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
         def choice_commit(count: true, reflog: true, force: true, **kwargs)
           kwargs[:attempts] ||= 1 unless force
           cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log')
-          cmd << quote_option('format', '(%h) %s')
+          cmd << quote_option('format', "#{commitstyle('%h')} %s")
           cmd << basic_option('max-count', env('GIT_COUNT', ARG[:CHOICE])) if count
-          choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /\((\w+)\)/, force: force, **kwargs)
+          ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
+          case ret
+          when Array
+            ret.map!(&:stripstyle)
+          when String
+            ret.stripstyle
+          else
+            ret
+          end
         end
 
         def choice_remote(force: false, **kwargs)
@@ -2026,13 +2036,13 @@ module Squared
         end
 
         def status_data(*args)
-          [].tap do |ret|
-            git_spawn('status -z -uall', *args).split("\x0").each do |line|
-              next unless line =~ /^(.)(.) (.+)$/
+          ret = []
+          git_spawn('status -z -uall', *args).split("\x0").each do |line|
+            next unless line =~ /^(.)(.) (.+)$/
 
-              ret << [$3, $2, $1]
-            end
+            ret << [$3, $2, $1]
           end
+          ret
         end
 
         def append_pull(opts, list, flag:, from:, target: @session, no: nil, remote: nil)
@@ -2108,7 +2118,9 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          target << quote_option('message', val) if val
+          return unless val
+
+          target << quote_option('message', val)
         end
 
         def append_head(val = nil, target: @session)
@@ -2205,6 +2217,10 @@ module Squared
           s.start_with?(/\d/) ? "@~#{s}" : "@#{s}"
         end
 
+        def commitstyle(val)
+          sub_style(val, theme[:extra] || color(:yellow))
+        end
+
         def matchhead(val)
           val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/ ? $2 || $1 || '' : nil
         end