From 44e5df843300dfc8c51ec8bbe843c9d44393b740 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Sat, 25 Aug 2018 16:04:27 -0400 Subject: [PATCH] Provide API for retrieving working dir relative path --- autoload/fugitive.vim | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index bd4eced..dcfa203 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -474,15 +474,33 @@ function! fugitive#Real(url) abort endfunction function! fugitive#Path(url, ...) abort - if !a:0 || empty(a:url) + if empty(a:url) + return '' + endif + let dir = a:0 > 1 ? a:2 : get(b:, 'git_dir', '') + let tree = s:Tree(dir) + if !a:0 return fugitive#Real(a:url) + elseif a:1 =~# '\.$' + let path = s:Slash(fugitive#Real(a:url)) + let cwd = getcwd() + let lead = '' + while s:cpath(tree . '/', (cwd . '/')[0 : len(tree)]) + if s:cpath(cwd . '/', path[0 : len(cwd)]) + if strpart(path, len(cwd) + 1) =~# '^\.git\%(/\|$\)' + break + endif + return a:1[0:-2] . (empty(lead) ? './' : lead) . strpart(path, len(cwd) + 1) + endif + let cwd = fnamemodify(cwd, ':h') + let lead .= '../' + endwhile + return a:1[0:-2] . path endif let url = s:Slash(fnamemodify(a:url, ':p')) if url =~# '/$' && s:Slash(a:url) !~# '/$' let url = url[0:-2] endif - let dir = a:0 > 1 ? a:2 : get(b:, 'git_dir', '') - let tree = s:Tree(dir) let [argdir, commit, file] = s:DirCommitFile(a:url) if len(argdir) && s:cpath(argdir) !=# s:cpath(dir) let file = '' @@ -2187,10 +2205,10 @@ function! s:Log(cmd, bang, line1, line2, ...) abort let before = substitute(args, ' --\S\@!.*', '', '') let after = strpart(args, len(before)) let path = s:Relative('/') + let relative = path[1:-1] if path =~# '^/\.git\%(/\|$\)' || len(after) let path = '' endif - let relative = s:Relative('') if before !~# '\s[^[:space:]-]' let owner = s:Owner(@%) if len(owner) -- 2.11.4.GIT