Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-11 08:55:43 +08:00
Code Issues Projects Releases Wiki Activity

feat(git.vim): complete git push command

Browse Source
This commit is contained in:
Eric Wong 2024-12-13 00:56:32 +08:00
parent b9eb91a793
commit 6358c2a435
2 changed files with 133 additions and 90 deletions
bundle/git.vim
autoload/git
push.vim
lua/git/command
push.lua

50
bundle/git.vim/autoload/git/push.vim

@ -4,13 +4,18 @@
" Author: Wang Shidong < wsdjeg@outlook.com > " Author: Wang Shidong < wsdjeg@outlook.com >
" License: GPLv3 " License: GPLv3
"============================================================================= "=============================================================================
if has('nvim-0.9.0')
function! git#push#complete(ArgLead, CmdLine, CursorPos) abort
return luaeval('require("git.command.push").complete(vim.api.nvim_eval("a:ArgLead"), vim.api.nvim_eval("a:CmdLine"), vim.api.nvim_eval("a:CursorPos"))')
endfunction
else
let s:JOB = SpaceVim#api#import('job') let s:JOB = SpaceVim#api#import('job')
let s:NOTI = SpaceVim#api#import('notify') let s:NOTI = SpaceVim#api#import('notify')
let s:push_jobid = 0 let s:push_jobid = 0
function! git#push#run(...) abort function! git#push#run(...) abort
if s:push_jobid != 0 if s:push_jobid != 0
call s:NOTI.notify('previous push not finished') call s:NOTI.notify('previous push not finished')
@ -38,9 +43,9 @@ function! git#push#run(...) abort
let s:push_jobid = 0 let s:push_jobid = 0
endif endif
endfunction endfunction
function! s:on_exit(id, data, event) abort function! s:on_exit(id, data, event) abort
if a:data != 0 if a:data != 0
for line in s:std_data.stderr for line in s:std_data.stderr
let s:NOTI.notify_max_width = max([strwidth(line) + 5, s:NOTI.notify_max_width]) let s:NOTI.notify_max_width = max([strwidth(line) + 5, s:NOTI.notify_max_width])
@ -53,34 +58,34 @@ function! s:on_exit(id, data, event) abort
endfor endfor
endif endif
let s:push_jobid = 0 let s:push_jobid = 0
endfunction endfunction
function! s:on_stdout(id, data, event) abort function! s:on_stdout(id, data, event) abort
for line in filter(a:data, '!empty(v:val) && v:val !~# "^remote:"') for line in filter(a:data, '!empty(v:val) && v:val !~# "^remote:"')
let s:NOTI.notify_max_width = max([strwidth(line) + 5, s:NOTI.notify_max_width]) let s:NOTI.notify_max_width = max([strwidth(line) + 5, s:NOTI.notify_max_width])
call s:NOTI.notify(line, 'Normal') call s:NOTI.notify(line, 'Normal')
endfor endfor
endfunction endfunction
" https://stackoverflow.com/questions/57016157/how-to-stop-git-from-writing-non-errors-to-stderr " https://stackoverflow.com/questions/57016157/how-to-stop-git-from-writing-non-errors-to-stderr
" "
" why git push normal info to stderr " why git push normal info to stderr
function! s:on_stderr(id, data, event) abort function! s:on_stderr(id, data, event) abort
call extend(s:std_data.stderr, filter(a:data, '!empty(v:val) && v:val !~# "^remote:"')) call extend(s:std_data.stderr, filter(a:data, '!empty(v:val) && v:val !~# "^remote:"'))
endfunction endfunction
function! s:options() abort function! s:options() abort
return [ return [
\ '-u', \ '-u',
\ '--set-upstream', \ '--set-upstream',
\ '-d', '--delete' \ '-d', '--delete'
\ ] \ ]
endfunction endfunction
function! git#push#complete(ArgLead, CmdLine, CursorPos) abort function! git#push#complete(ArgLead, CmdLine, CursorPos) abort
let str = a:CmdLine[:a:CursorPos-1] let str = a:CmdLine[:a:CursorPos-1]
if str =~# '^Git\s\+push\s\+-$' if str =~# '^Git\s\+push\s\+-$'
return join(s:options(), "\n") return join(s:options(), "\n")
@ -90,13 +95,13 @@ function! git#push#complete(ArgLead, CmdLine, CursorPos) abort
let remote = matchstr(str, '\(Git\s\+push\s\+\)\@<=[^ ]*') let remote = matchstr(str, '\(Git\s\+push\s\+\)\@<=[^ ]*')
return s:remote_branch(remote) return s:remote_branch(remote)
endif endif
endfunction endfunction
function! s:remotes() abort function! s:remotes() abort
return map(systemlist('git remote'), 'trim(v:val)') return map(systemlist('git remote'), 'trim(v:val)')
endfunction endfunction
function! s:remote_branch(remote) abort function! s:remote_branch(remote) abort
let branchs = systemlist('git branch -a') let branchs = systemlist('git branch -a')
if v:shell_error if v:shell_error
return '' return ''
@ -104,4 +109,5 @@ function! s:remote_branch(remote) abort
let branchs = join(map(filter(branchs, 'v:val =~ "\s*remotes/" . a:remote . "/[^ ]*$"'), 'trim(v:val)[len(a:remote) + 9:]'), "\n") let branchs = join(map(filter(branchs, 'v:val =~ "\s*remotes/" . a:remote . "/[^ ]*$"'), 'trim(v:val)[len(a:remote) + 9:]'), "\n")
return branchs return branchs
endif endif
endfunction endfunction
endif

39
bundle/git.vim/lua/git/command/push.lua

@ -71,6 +71,43 @@ function M.run(argv)
end end
end end
function M.complete(ArgLead, CmdLine, CursorPos) end local options = { '-u', '--set-upstream', '-d', '--delete' }
local function remotes()
return vim.tbl_map(function(t)
return vim.fn.trim(t)
end, vim.fn.systemlist('git remote'))
end
local function remote_branch(r)
local branchs = vim.fn.systemlist('git branch -a')
if vim.v.shell_error then
return ''
else
branchs = table.concat(
vim.fn.map(
vim.fn.filter(branchs, [[v:val =~ "\s*remotes/" . a:remote . "/[^ ]*$"]]),
'trim(v:val)[len(a:remote) + 9:]'
),
'\n'
)
return branchs
end
end
function M.complete(ArgLead, CmdLine, CursorPos)
local str = string.sub(CmdLine, 1, CursorPos)
if vim.regex([[^Git\s\+push\s\+-$]]):match_str(str) then
return table.concat(options, '\n')
elseif
vim.regex([[^Git\s\+push\s\+[^ ]*$]]):match_str(str)
or vim.regex([[^Git\s\+push\s\+-u\s\+[^ ]*$]]):match_str(str)
then
return table.concat(remotes(), '\n')
else
local remote = vim.fn.matchstr(str, [[\(Git\s\+push\s\+\)\@<=[^ ]*]])
return remote_branch(remote)
end
end
return M return M