squared 0.7.13 → 0.8.0

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

@@ -2,10 +2,12 @@
 
 module Squared
   module Workspace
+    GIT_PROTO = %r{\A(https?|ssh|git|file)://}i.freeze
+    private_constant :GIT_PROTO
+
     module Git
       GIT_REPO = Support.hashobj
-      GIT_PROTO = %r{\A(https?|ssh|git|file)://}i.freeze
-      private_constant :GIT_REPO, :GIT_PROTO
+      private_constant :GIT_REPO
 
       attr_reader :revfile
 
@@ -141,6 +143,7 @@ module Squared
         end
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue => e
+        log&.debug e
         warn log_warn(e, pass: true) if warning
       ensure
         @revlock = false
@@ -169,10 +172,9 @@ module Squared
           fetch: {
             base: %w[multiple porcelain progress P|prune-tags refetch stdin u|update-head-ok
                      recurse-submodules-default=b?].freeze,
-            pull: %w[n t 4|ipv4 6|ipv6 a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet
-                     set-upstream unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q
-                     recurse-submodules=v refmap=q o|server-option=q shallow-exclude=b shallow-since=v
-                     upload-pack=q].freeze
+            pull: %w[4 6 n t a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet set-upstream
+                     unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q recurse-submodules=v
+                     refmap=q o|server-option=q shallow-exclude=b shallow-since=v upload-pack=q].freeze
           }.freeze,
           git: {
             add: %w[N|intent-to-add].freeze,
@@ -187,6 +189,7 @@ module Squared
                      A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=n
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
+            remote: %w[f m=b t=b no-tags tags mirror=b].freeze,
             revert: %w[e S=bm? n|no-commit reference cleanup=b gpg-sign=b? m|mainline=i s|signoff strategy=b
                        X|strategy-option=b].freeze,
             rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse
@@ -212,7 +215,7 @@ module Squared
                      graph ita-invisible-in-index minimal name-only name-status no-color-moved-ws no-prefix no-renames
                      numstat patch-with-raw patch-with-stat patience pickaxe-all pickaxe-regex raw shortstat summary
                      a|text abbrev=i? anchored=q break-rewrites=b? color=b color-moved=b color-moved-ws=b color-words=q?
-                     diff-algorithm=b diff-filter=q? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
+                     diff-algorithm=b diff-filter=e? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
                      find-object=b find-renames=b? ignore-matching-lines=q ignore-submodules=b? line-prefix=q
                      max-depth=n output=p output-indicator-context=q output-indicator-new=q output-indicator-old=q
                      relative=p rotate-to=p skip-to=p src-prefix=q stat=b? stat-count=i stat-width=i stat-name-width=i
@@ -233,6 +236,16 @@ module Squared
                      f|force-rebase ignore-date ignore-whitespace i|interactive keep-base m|merge no-ff q|quiet quit
                      reset-author-date root show-current-patch signoff v|verbose empty=b x|exec=q gpg-sign=b? onto=b
                      r|rebase-merges=b s|strategy=b X|strategy-option=b trailer=q whitespace=b].freeze,
+          remote: {
+            rename: %w[no-progress progress].freeze,
+            remove: [].freeze,
+            'set-head': %w[a|auto d|delete].freeze,
+            'set-branches': %w[add].freeze,
+            'get-url': %w[all push].freeze,
+            'set-url': %w[add delete push].freeze,
+            show: %w[n].freeze,
+            prune: %w[n dry-run].freeze
+          }.freeze,
           reset: %w[N pathspec-file-nul q|quiet pathspec-from-file=p].freeze,
           restore: %w[ignore-skip-worktree-bits ignore-unmerged m|merge ours p|patch pathspec-file-nul q|quiet S|staged
                       theirs W|worktree conflict=b pathspec-from-file=p s|source=b].freeze,
@@ -277,7 +290,7 @@ module Squared
             checkout: %w[overwrite-ignore guess overlay progress recurse-submodules track].freeze,
             fetch: {
               base: %w[auto-gc auto-maintenance write-commit-graph write-fetch-head].freeze,
-              pull: %w[all recurse-submodules show-forced-updates tags].freeze
+              pull: %w[all ipv4 ipv6 recurse-submodules show-forced-updates tags].freeze
             },
             grep: %w[color exclude-standard recursive textconv].freeze,
             log: {
@@ -310,7 +323,7 @@ module Squared
           }.freeze,
           rebase: {
             send: %w[continue skip abort quit].freeze,
-            value: %w[false true merges interactive].freeze
+            value: %w[true false merges interactive].freeze
           }.freeze,
           reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze,
           revbuild: %w[untracked-files ignore-submodules ignored].freeze
@@ -345,12 +358,13 @@ module Squared
           'pull' => %i[origin remote all].freeze,
           'rebase' => %i[branch onto send].freeze,
           'refs' => %i[heads tags remote].freeze,
+          'remote' => %i[add select].freeze,
           'reset' => %i[commit index patch mode undo].freeze,
           'restore' => %i[source staged worktree].freeze,
           'rev' => %i[commit branch build output].freeze,
           'show' => %i[format oneline textconv].freeze,
           'sparse-checkout' => %i[add reapply list clean disable].freeze,
-          'stash' => %i[push pop apply branch drop clear list all staged worktree].freeze,
+          'stash' => %i[push pop apply drop command].freeze,
           'submodule' => %i[status update branch url sync].freeze,
           'switch' => %i[branch create detach].freeze,
           'tag' => %i[add sign delete list].freeze
@@ -481,31 +495,37 @@ module Squared
                     when :add, :sign
                       format_desc action, flag, 'name,message?,commit?,remote?'
                       task flag, [:name, :message, :commit, :remote] do |_, args|
-                        remote = if (name = args.name)
-                                   message = args.message
-                                   commit = commithead args.commit
-                                   args.remote
-                                 else
-                                   commit, name, message = choice_commit(reflog: false, series: true,
-                                                                         values: [
-                                                                           ['Enter tag name', true],
-                                                                           'Enter message'
-                                                                         ])
-                                   choice_remote
-                                 end
+                        if (name = args.name)
+                          message = args.message
+                          commit = commithead args.commit
+                          remote = args.remote
+                          if !remote && commit && !commit.start_with?('@') && !git_grep('remote', commit).empty?
+                            remote = commit
+                            commit = nil
+                          end
+                        else
+                          commit, name, message = choice_commit(reflog: false, series: true,
+                                                                values: [['Enter tag name', true], 'Enter message'])
+                          remote = choice_remote
+                        end
                         ret = tag(flag, refs: [name], message: message, commit: commit, remote: remote)
                         success?(ret, !remote)
                       end
                     end
                   when 'stash'
-                    format_desc(action, flag, 'opts*', after: case flag
+                    format_desc(action, flag, 'opts*', before: ('clear|list|all|staged|worktree' if flag == :command),
+                                                       after: case flag
                                                               when :push then 'pathspec*,:'
-                                                              when :branch then 'name,stash/:'
-                                                              when :clear, :list, :all then nil
+                                                              when :command then nil
                                                               else 'stash?|:'
                                                               end)
                     task flag do |_, args|
-                      stash flag, args.to_a
+                      args = args.to_a
+                      if flag == :command
+                        param_guard(action, flag, args: args)
+                        flag = args.shift.to_sym
+                      end
+                      stash flag, args
                     end
                   when 'log', 'diff', 'range-diff'
                     case flag
@@ -531,7 +551,7 @@ module Squared
                             end
                             args = args.drop(index.size)
                           end
-                          log!(flag, args, index: index)
+                          log_(flag, args, index: index)
                         end
                         next
                       end
@@ -549,7 +569,7 @@ module Squared
                           opts.concat(refs.shellsplit) if refs
                         end
                         if action == 'log'
-                          log!(flag, opts, range: range)
+                          log_(flag, opts, range: range)
                         else
                           diff(flag, opts, range: range, from: action.to_sym)
                         end
@@ -601,10 +621,10 @@ module Squared
                           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
@@ -613,7 +633,7 @@ module Squared
                           end
                         end
                         param_guard(action, flag, args: grep)
-                        log!(flag, opts, grep: grep)
+                        log_(flag, opts, grep: grep)
                       end
                     end
                   when 'checkout'
@@ -794,10 +814,10 @@ module Squared
                                end
                         success?(reset(flag, args, commit: commit))
                       end
-                    when :index, :undo
-                      format_desc(action, flag, ('opts*,pathspec*' if flag == :index))
+                    when :index
+                      format_desc action, flag, 'opts*,pathspec*'
                       task flag do |_, args|
-                        reset(flag, flag == :index ? args.to_a : [])
+                        reset(flag, args.to_a, refs: [])
                       end
                     when :mode
                       format_desc action, flag, 'mode,ref/:'
@@ -812,6 +832,11 @@ module Squared
                         ref = commithead args.ref
                         reset(flag, refs: args.extras, ref: !ref || ref == ':' ? choice_commit(reflog: false) : ref)
                       end
+                    when :undo
+                      format_desc action, flag
+                      task flag do
+                        reset flag
+                      end
                     end
                   when 'show'
                     case flag
@@ -976,6 +1001,51 @@ module Squared
                     task flag do |_, args|
                       sparse_checkout flag, args.to_a
                     end
+                  when 'remote'
+                    if flag == :add
+                      format_desc action, flag, 'name,url,opts*'
+                      task flag, [:name, :url] do |_, args|
+                        name = param_guard(action, flag, args: args, key: :name)
+                        url = param_guard(action, flag, args: args, key: :url)
+                        raise ArgumentError, message('invalid url', hint: url) unless url.match?(GIT_PROTO)
+
+                        git(:remote, args.extras, extras: [name, url])
+                      end
+                    else
+                      format_desc action, flag, "#{OPT_GIT[:remote].keys.join('|')},opts*" if TASK_METADATA
+                      task flag, [:command] do |_, args|
+                        command = param_guard(action, flag, args: args, key: :command)
+                        cmd, opts = git_session('remote', opts: args.extras)
+                        param = case command
+                                when 'rename'
+                                  'New name'
+                                when 'set-branches'
+                                  'Branches'
+                                when 'set-head'
+                                  'Branch' if opts.empty?
+                                when 'set-url'
+                                  'URL'
+                                end
+                        remote, target = choice_remote(force: true, values: param ? [[param, true]] : [])
+                        cmd << '-v' if has_value!(opts, 'v', 'verbose') && command == 'show'
+                        cmd << command << remote
+                        op = OptionPartition.new(opts, OPT_GIT[:remote].fetch(command.to_sym, []), cmd,
+                                                 project: self, strict: strict?)
+                        case command
+                        when 'remove'
+                          exit 1 unless confirm_basic('Remove?', remote, 'N')
+                        when 'get-url', 'show', 'prune'
+                          status = false
+                        else
+                          raise ArgumentError, message('unrecognized command', command, hint: action) unless param
+                          raise ArgumentError, message('missing target', command, hint: action) unless target
+
+                          op << target
+                        end
+                        op.clear
+                        success?(source(banner: !quiet?), status)
+                      end
+                    end
                   when 'git'
                     before = case flag
                              when :blame
@@ -1048,15 +1118,16 @@ module Squared
               op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, strict: strict?,
                                                                   no: OPT_GIT[:no][:pull])
               opts -= op.extras
-              reg, neg = matchmap(op, negate: true)
+              reg = matchmap op
               session_done op.target
               heads = []
               cur = nil
               foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
                 cur ||= line.delete_prefix!('* ')
-                heads << line if matchany?(reg, line) && !matchany?(neg, line, empty: false)
+                heads << line if matchany?(reg, line)
               end
-              raise_error 'head not found', hint: 'for-each-ref' unless cur
+              raise message('head not found', hint: 'for-each-ref') unless cur
+
               opts << 'ff-only' if opts.empty? && option('ff-only', notequals: '0')
               (heads.dup << cur).each_with_index do |branch, i|
                 next unless (i < heads.size && cur != branch) || i == heads.size
@@ -1201,11 +1272,7 @@ module Squared
                                                       first: (matchpathspec if flag == :push))
             case flag
             when :push
-              if op.remove(':')
-                op.readline('Enter message', option: 'message', quote: true)
-              else
-                append_message
-              end
+              op.readline('Enter message', option: 'message', quote: true) if op.remove(':')
               append_pathspec op.extras
             when :pop, :apply, :drop, :branch
               if op.remove(':')
@@ -1223,22 +1290,21 @@ module Squared
                 else
                   op << out
                 end
-              elsif !op.empty?
-                op.add_first(prefix: ':')
               elsif flag == :branch
-                raise ArgumentError, 'no branch name'
+                op.add_first(prefix: ':', expect: 'no branch name')
               end
-              op.clear
+              op.add_first
+                .clear
             when :clear
               n = sub_style file.read.lines.size, theme[:inline]
               s = sub_style name, theme[:active]
               source(stdout: true) if confirm("Remove #{n} stash entries from #{s}?", 'N')
               return
-            when :list
+            else
               op.clear
               out, banner, from = source(io: true)
               print_item banner
-              list_result(write_lines(out), 'objects', banner: banner, from: from)
+              list_result(write_lines(out), 'objects', from: from)
               return
             end
           else
@@ -1290,7 +1356,7 @@ module Squared
           end
           out, banner, from = source(io: true)
           ret = write_lines(out, banner: banner, sub: sub)
-          list_result(ret, 'files', action: 'modified', banner: banner, from: from)
+          list_result(ret, 'files', action: 'modified', from: from)
         end
 
         def revbuild(flag = nil, opts = [], **kwargs)
@@ -1325,6 +1391,7 @@ module Squared
 
           sync = kwargs.fetch(:sync) { invoked_sync?('revbuild', flag) }
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? kw.call : @revbuild || { pass: true }
+          from = symjoin 'git', 'revbuild'
           case flag
           when :build
             op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self, strict: strict?)
@@ -1337,7 +1404,7 @@ module Squared
                    .compact
             OptionPartition.uniq!(args)
           end
-          run_p(*Array(kwargs[:before]), sync: sync, from: :revbuild) if kwargs[:before]
+          run_p(*Array(kwargs[:before]), sync: sync, from: symjoin(from, 'before')) if kwargs[:before]
           force = if (force = env('REVBUILD_FORCE', strict: true))
                     force != '0' && force != 'false'
                   elsif (force = ENV['GIT_FORCE'] || ENV['REVBUILD_FORCE'])
@@ -1352,7 +1419,7 @@ module Squared
             end
           end
           start = time_epoch
-          ret = build(*@output, sync: sync, from: symjoin('git', 'revbuild'))
+          ret = build(*@output, sync: sync, from: from)
         rescue => e
           print_error(e, pass: true)
         else
@@ -1360,7 +1427,7 @@ module Squared
             print_status('revbuild', subject: name, start: start, loglevel: Logger::WARN, from: :failed)
             workspace.rev_timeutc name, 'build'
           else
-            run_p(*Array(kwargs[:after]), sync: sync, from: :revbuild) if kwargs[:after] && ret != false
+            run_p(*Array(kwargs[:after]), sync: sync, from: symjoin(from, 'after')) if kwargs[:after] && ret != false
             print_status('revbuild', subject: name, start: start)
             workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
                                 sync: sync, utc: 'build')
@@ -1458,7 +1525,7 @@ module Squared
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, grep: op.extras)
-            list_result(ret, 'tags', grep: op.extras, banner: banner, from: from)
+            list_result(ret, 'tags', grep: op.extras, from: from)
             return
           end
           if (ret = source) && (remote ||= option('remote'))
@@ -1467,11 +1534,11 @@ module Squared
           ret
         end
 
-        def log!(flag, opts = [], range: [], index: [], grep: [])
+        def log_(flag, opts = [], range: [], index: [], grep: [])
           cmd, opts = git_session('log', opts: opts)
-          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd,
-                                   project: self, strict: strict?, no: collect_hash(OPT_GIT[:no][:log]),
-                                   first: matchpathspec)
+          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd, project: self, strict: strict?,
+                                                                           no: collect_hash(OPT_GIT[:no][:log]),
+                                                                           first: matchpathspec)
           case flag
           when :between, :contain
             op.add_quote(range.join(flag == :between ? '..' : '...'))
@@ -1484,7 +1551,6 @@ module Squared
           append_pathspec op.extras
           source(exception: false)
         end
-        alias log_ log!
 
         def diff(flag, opts = [], refs: [], branch: nil, range: [], index: [], from: :diff)
           cmd, opts = git_session(from, opts: opts)
@@ -1517,7 +1583,8 @@ module Squared
               op.add_quote(branch) if branch
               if !index.empty?
                 if op.arg?('cached')
-                  raise_error "single commit: #{index.join(', ')}", hint: 'cached' unless index.size == 1
+                  raise message('single commit only', index.join(', '), hint: flag) unless index.size == 1
+
                   op << index.first
                 else
                   op.merge(index)
@@ -1528,7 +1595,7 @@ module Squared
             end
             if (n = op.index('>'))
               patch = op.slice!(n, 2)[1]
-            elsif !op.last.include?('*') && !op.exist?(op.last)
+            elsif !op.exist?(op.last)
               patch ||= op.pop
             end
             append_pathspec op.extras
@@ -1580,9 +1647,9 @@ module Squared
             next if line.empty?
 
             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 || origin.empty?) && !dryrun?
+            raise message('work tree is not usable', hint: hint[1..-2]) if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
+
+            if (!origin || origin.empty?) && !dryrun?
               return nil if pass
 
               unless (origin = option('upstream', prefix: 'git', ignore: false))
@@ -1685,7 +1752,8 @@ module Squared
             cmd << shell_quote(target)
             cmd << shell_quote(ref) if ref
           when :track
-            raise_error 'invalid upstream', hint: ref unless ref.include?('/')
+            raise message('invalid upstream', hint: ref) unless ref.include?('/')
+
             if ref.delete_prefix!('^')
               cmd << '--unset-upstream' << shell_quote(ref)
               remote = false
@@ -1726,7 +1794,7 @@ module Squared
               opt_style(color(:green), /^(\*\s+)(\S+)(.*)$/, 2),
               opt_style(color(:red), %r{^(\s*)(remotes/\S+)(.*)$}, 2)
             ])
-            list_result(ret, 'branches', banner: banner, from: from)
+            list_result(ret, 'branches', from: from)
             return
           else
             if (head = git_spawn('rev-parse --abbrev-ref HEAD').chomp).empty?
@@ -1735,7 +1803,7 @@ module Squared
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               cmd << '-vv --no-abbrev --list'
               out, banner, from = source(io: true)
-              first = from_base?('branch')
+              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?
@@ -1743,15 +1811,15 @@ module Squared
                 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+)$/
+                md = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2])
+                if (r1 = md[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
                   write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, theme[:warn])}" }
                   r1 = $1
                   r2 = $2 && write.call($2, $3)
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
-                ["#{"\n" unless index == 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: #{md[2]}"]
                   .compact
                   .join("\n")
               end
@@ -1808,7 +1876,9 @@ module Squared
 
         def restore(flag, opts = [], commit: nil, files: nil)
           cmd, opts = git_session('restore', shell_option(flag, commit, escape: false, force: false), opts: opts)
-          op = OptionPartition.new(opts, OPT_GIT[:restore] + OPT_GIT[:log][:diff_context], cmd,
+          op = OptionPartition.new(opts,
+                                   OPT_GIT[:restore] + OPT_GIT[:log][:diff_context],
+                                   cmd,
                                    project: self, strict: strict?, no: OPT_GIT[:no][:restore], first: matchpathspec)
           append_pathspec(op.extras + (files || []), pass: false)
           source(sync: false, stderr: true)
@@ -1821,7 +1891,7 @@ module Squared
             cmd << '--textconv'
             append_value(files.flat_map { |val| Dir[val] }
                               .select { |val| projectpath?(val) }
-                              .map { |val| "HEAD:#{val}" })
+                              .map { |val| shell_quote("HEAD:#{val}") })
             source(banner: false)
             return
           when :oneline
@@ -1835,11 +1905,12 @@ module Squared
           else
             opts << format if format
           end
-          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + collect_hash(OPT_GIT[:log], pass: [:base])
+          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
           op = OptionPartition.new(opts, list, cmd,
-                                   project: self, strict: strict?,
+                                   project: self,
+                                   strict: strict?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
-          op.append
+          op.append(delim: true)
           source(exception: false, banner: flag != :oneline)
         end
 
@@ -1862,8 +1933,8 @@ module Squared
               cmd << '--sq-quote'
               args = true
             end
-            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd, project: self, strict: strict?, args: args,
-                                                                no: OPT_GIT[:no][:rev_parse])
+            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd,
+                                project: self, strict: strict?, no: OPT_GIT[:no][:rev_parse], args: args)
                            .append(escape: args)
           end
           source(banner: verbose?)
@@ -1890,8 +1961,8 @@ module Squared
           op.add_quote(remote) if remote
           out, banner, from = source(io: true)
           print_item banner
-          ret = write_lines(out, grep: op.extras)
-          list_result(ret, flag.to_s, grep: op.extras, banner: banner, from: from)
+          ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
+          list_result(ret, flag.to_s, grep: op.extras, from: from)
         end
 
         def ls_files(flag, opts = [])
@@ -1901,12 +1972,12 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras)
-          list_result(ret, 'files', grep: op.extras, banner: banner, from: from)
+          list_result(ret, 'files', grep: op.extras, from: from)
         end
 
-        def git(flag, opts = [])
+        def git(flag, opts = [], extras: [])
           cmd, opts = git_session(flag, opts: opts)
-          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, [])
+          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, []).yield_self { |a| a.is_a?(Array) ? a : [] }
           case flag
           when :add
             list.concat(OPT_GIT[:log][:diff_context])
@@ -1915,7 +1986,8 @@ module Squared
           when :'sparse-checkout'
             cmd << 'set'
           end
-          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: OPT_GIT[:no][flag],
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?,
+                                                    no: OPT_GIT[:no][flag], single: /\A\d+\z/,
                                                     first: case flag
                                                            when :blame, :revert, :'sparse-checkout' then nil
                                                            else matchpathspec
@@ -1954,6 +2026,12 @@ module Squared
               end
             end
             return source(git_session('status -s'), banner: false) unless append_pathspec(op.extras)
+          when :remote
+            op.unshift(*extras)
+            op.adjoin('add')
+              .add_first(expect: 'missing name')
+              .add_first(expect: 'missing URL', quote: true)
+              .clear
           when :mv
             refs = projectmap op.extras
             raise 'no source/destination' unless refs.size > 1
@@ -1982,7 +2060,7 @@ module Squared
           when :revert, :mv, :rm
             source(sync: false, stderr: true)
           else
-            success?(source, flag == :'sparse-checkout' || (flag == :add && !op.arg?('verbose')))
+            success?(source, %i[remote sparse-checkout].include?(flag) || (flag == :add && !op.arg?('verbose')))
           end
         end
 
@@ -1994,7 +2072,7 @@ module Squared
           build? && !!workspace.revfile
         end
 
-        def enabled?(*, **kwargs)
+        def enabled?(**kwargs)
           super || (kwargs[:base] == false && !!clone?)
         end
 
@@ -2069,13 +2147,13 @@ module Squared
           end
         end
 
-        def list_result(size, type, action: 'found', grep: [], banner: nil, from: nil)
+        def list_result(size, type, action: 'found', grep: [], from: nil)
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
-          elsif stdout? && (banner.nil? || (banner.is_a?(String) && !banner.empty?))
+          elsif stdout?
             styles = theme.fetch(:banner, []).reject { |val| val.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
-            puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
+            puts print_footer("#{size} #{size == 1 ? type.sub(/((?<!l)e)?s\z/, '') : type}",
                               sub: opt_style(styles, /^(\d+)(.+)$/))
           end
           on :last, from
@@ -2104,7 +2182,7 @@ module Squared
           ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
-            ret.map { |val| val.is_a?(Array) ? val.map { |s| s&.stripstyle } : val&.stripstyle }
+            ret.map(&:stripstyle)
           when String
             ret.stripstyle
           else
@@ -2141,8 +2219,8 @@ module Squared
           append_submodules(target: target, from: from)
           return if !remote && opts.empty?
 
-          op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target,
-                                   project: self, strict: strict?, no: no)
+          op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target, project: self, strict: strict?,
+                                                                                       no: no)
           refspec = op.each_with_object([]) do |opt, out|
             if opt =~ op.values
               case $1
@@ -2189,9 +2267,9 @@ module Squared
           end
         end
 
-        def append_pathspec(files = [], target: @session, expect: false, strict: strict?, **kwargs)
+        def append_pathspec(files = [], target: @session, expect: false, **kwargs)
           if session_arg?('pathspec-from-file', target: target)
-            OptionPartition.clear(target, files, strict: strict, styles: theme[:inline])
+            OptionPartition.clear(target, files, styles: theme[:inline])
             true
           else
             option('pathspec', target: target) { |val| files = split_escape(val) } if files.empty?
@@ -2282,7 +2360,21 @@ module Squared
                                                                       stdout: stdout, banner: banner, **kwargs)
         end
 
-        def quiet?(*, target: @session, **)
+        def git_grep(cmd, *grep, equals: true, **kwargs)
+          ret = []
+          git_spawn(cmd, **kwargs).lines(chomp: true).each do |line|
+            if grep.any? { |val| val.is_a?(Regexp) ? val.match?(line) : equals ? line == val : line.include?(val) }
+              ret << line
+            end
+          end
+          ret
+        end
+
+        def dryrun?(target: @session, prefix: target&.first, **)
+          Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
+        end
+
+        def quiet?(target: @session, **)
           return silent? unless target
 
           silent? || target.include?('--quiet') || (target.include?('-q') && target.first.stripext == 'git')
@@ -2294,7 +2386,8 @@ module Squared
 
         def repotrack(origin, branch, quote: true)
           n = origin&.index('/')
-          raise_error "missing #{origin ? 'branch' : 'remote'} name", hint: origin unless n && branch
+          raise message("missing #{origin ? 'branch' : 'remote'} name", hint: origin) unless n && branch
+
           branch = "#{branch}:#{origin[n.succ..-1]}" unless origin.end_with?("/#{branch}")
           ret = [origin[0..n.pred], branch]
           ret.quote! if quote