Skip to content

Fix error when using lcd, amend commit 11c1ca1. #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
farhanmustar wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix error when using lcd, amend commit 11c1ca1. #88

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d9be05
Fix error when using lcd, amend commit 11c1ca1.
farhanmustar Feb 22, 2021
f45e108
Fix working buffer directory changed and add b:current_path to fix fa…
farhanmustar Mar 5, 2021
bce7292
Fix older vim does not have chdir function.
farhanmustar Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions plugin/gv.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,8 @@ endfunction

function! s:log_opts(fugitive_repo, bang, visual, line1, line2)
if a:visual || a:bang
let current = expand('%')
call s:check_buffer(a:fugitive_repo, current)
return a:visual ? [[printf('-L%d,%d:%s', a:line1, a:line2, current)], []] : [['--follow'], ['--', current]]
call s:check_buffer(a:fugitive_repo, b:current_path)
return a:visual ? [[printf('-L%d,%d:%s', a:line1, a:line2, b:current_path)], []] : [['--follow'], ['--', b:current_path]]
endif
return [['--graph'], []]
endfunction
Expand Down Expand Up @@ -317,6 +316,14 @@ function! s:gl(buf, visual)
let w:quickfix_title = 'o: open / o (in visual): diff / O: open (tab) / q: quit'
endfunction

function! s:chdir(path)
if exists('*chdir')
call chdir(a:path)
else
execute 'lcd '.a:path
endif
endfunction

function! s:gld() range
let [to, from] = map([a:firstline, a:lastline], 'split(getline(v:val), "|")[0]')
execute (tabpagenr()-1).'tabedit' escape(to, ' ')
Expand All @@ -337,18 +344,18 @@ function! s:gv(bang, visual, line1, line2, args) abort
endif

let fugitive_repo = fugitive#repo(git_dir)
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let cwd = getcwd()
let root = fugitive_repo.tree()

call s:chdir(root)
let b:current_path = expand('%')
call s:chdir('-')

try
if cwd !=# root
execute cd escape(root, ' ')
endif
if a:args =~ '?$'
if len(a:args) > 1
return s:warn('invalid arguments')
endif
call s:check_buffer(fugitive_repo, expand('%'))
call s:check_buffer(fugitive_repo, b:current_path)
call s:gl(bufnr(''), a:visual)
else
let [opts1, paths1] = s:log_opts(fugitive_repo, a:bang, a:visual, a:line1, a:line2)
Expand All @@ -358,12 +365,9 @@ function! s:gv(bang, visual, line1, line2, args) abort
call s:list(fugitive_repo, log_opts)
call FugitiveDetect(@#)
endif
call s:chdir(root)
catch
return s:warn(v:exception)
finally
if getcwd() !=# cwd
cd -
endif
endtry
endfunction

Expand Down