m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 13:23:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show local commits when no upstream is set

Browse Source 
References: https://github.com/tpope/vim-fugitive/issues/1963
Resolves: https://github.com/tpope/vim-fugitive/issues/1977
This commit is contained in:
Maksim Odnoletkov
2022-04-20 17:15:33 +01:00
committed by Tim Pope
parent 200593827e
commit 70251a915f
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
autoload/fugitive.vim
View File

@@ -2528,7 +2528,7 @@ function! s:ReplaceCmd(cmd) abort
endfunction endfunction
function! s:QueryLog(refspec, limit) abort function! s:QueryLog(refspec, limit) abort
let lines = s:LinesError(['log', '-n', '' . a:limit, '--pretty=format:%h%x09%s', a:refspec, '--'])[0] let lines = s:LinesError(['log', '-n', '' . a:limit, '--pretty=format:%h%x09%s'] + a:refspec + ['--'])[0]
call map(lines, 'split(v:val, "\t", 1)') call map(lines, 'split(v:val, "\t", 1)')
call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}') call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
return lines return lines
@@ -2578,9 +2578,9 @@ function! s:AddSection(label, lines, ...) abort
call append(line('$'), ['', a:label . (len(note) ? ': ' . note : ' (' . len(a:lines) . ')')] + s:Format(a:lines)) call append(line('$'), ['', a:label . (len(note) ? ': ' . note : ' (' . len(a:lines) . ')')] + s:Format(a:lines))
endfunction endfunction
function! s:AddLogSection(label, a, b) abort function! s:AddLogSection(label, refspec) abort
let limit = 256 let limit = 256
let log = s:QueryLog(a:a . '..' . a:b, limit) let log = s:QueryLog(a:refspec, limit)
if empty(log) if empty(log)
return return
elseif len(log) == limit elseif len(log) == limit
@@ -2846,16 +2846,19 @@ function! fugitive#BufReadStatus(...) abort
let staged_end = len(staged) ? line('$') : 0 let staged_end = len(staged) ? line('$') : 0
if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ') if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ')
call s:AddLogSection('Unpushed to ' . push, push, head) call s:AddLogSection('Unpushed to ' . push, [push . '..' . head])
endif endif
if len(pull) && push !=# pull if len(pull) && push !=# pull
call s:AddLogSection('Unpushed to ' . pull, pull, head) call s:AddLogSection('Unpushed to ' . pull, [pull . '..' . head])
endif
if empty(pull) && empty(push) && empty(rebasing)
call s:AddLogSection('Unpushed to *', [head, '--not', '--remotes'])
endif endif
if len(push) && push !=# pull if len(push) && push !=# pull
call s:AddLogSection('Unpulled from ' . push, head, push) call s:AddLogSection('Unpulled from ' . push, [head . '..' . push])
endif endif
if len(pull) && get(props, 'branch.ab') !~# ' -0$' if len(pull) && get(props, 'branch.ab') !~# ' -0$'
call s:AddLogSection('Unpulled from ' . pull, head, pull) call s:AddLogSection('Unpulled from ' . pull, [head . '..' . pull])
endif endif
setlocal nomodified readonly noswapfile setlocal nomodified readonly noswapfile
@@ -5036,6 +5039,9 @@ function! s:DoStageUnpushedHeading(heading) abort
let remote = '.' let remote = '.'
endif endif
let branch = matchstr(a:heading, 'to \%([^/]\+/\)\=\zs\S\+') let branch = matchstr(a:heading, 'to \%([^/]\+/\)\=\zs\S\+')
if branch ==# '*'
return
endif
call feedkeys(':Git push ' . remote . ' ' . '@:' . 'refs/heads/' . branch) call feedkeys(':Git push ' . remote . ' ' . '@:' . 'refs/heads/' . branch)
endfunction endfunction
@@ -5049,6 +5055,9 @@ function! s:DoStageUnpushed(record) abort
let remote = '.' let remote = '.'
endif endif
let branch = matchstr(a:record.heading, 'to \%([^/]\+/\)\=\zs\S\+') let branch = matchstr(a:record.heading, 'to \%([^/]\+/\)\=\zs\S\+')
if branch ==# '*'
return
endif
call feedkeys(':Git push ' . remote . ' ' . a:record.commit . ':' . 'refs/heads/' . branch) call feedkeys(':Git push ' . remote . ' ' . a:record.commit . ':' . 'refs/heads/' . branch)
endfunction endfunction