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

Rearrange fugitive#ResolveRemote()

Browse Source 
This came out of a refactor to return the various URL components
separately.  I'm not ready to merge that, but this change feels like
enough of an improvement to merge for its own sake.
This commit is contained in:
Tim Pope
2021-08-21 18:03:21 -04:00
parent 57eeed2545
commit 39ff394b4e
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
autoload/fugitive.vim
View File

@@ -1117,7 +1117,16 @@ endfunction
let s:redirects = {}
function! fugitive#ResolveRemote(remote) abort
if a:remote =~# '^https\=://' && s:executable('curl')
let scp_authority = matchstr(a:remote, '^[^:/]\+\ze:\%(//\)\@!')
if len(scp_authority) && !(has('win32') && scp_authority =~# '^\a:[\/]')
let path = strpart(a:remote, len(scp_authority) + 1)
let authority = fugitive#SshHostAlias(scp_authority)
if authority !~# ':'
return authority . ':' . path
elseif path =~# '^/'
return 'ssh://' . authority . path
endif
elseif a:remote =~# '^https\=://' && s:executable('curl')
if !has_key(s:redirects, a:remote)
let s:redirects[a:remote] = matchstr(join(s:JobExecute(
\ ['curl', '--disable', '--silent', '--max-time', '5', '-I',
@@ -1131,19 +1140,7 @@ function! fugitive#ResolveRemote(remote) abort
let authority = matchstr(a:remote, '[^/?#]*', 6)
return 'ssh://' . fugitive#SshHostAlias(authority) . strpart(a:remote, 6 + len(authority))
endif
let scp_authority = matchstr(a:remote, '^[^:/]\+\ze:\%(//\)\@!')
if empty(scp_authority)
return a:remote
endif
let path = strpart(a:remote, len(scp_authority) + 1)
let alias = fugitive#SshHostAlias(scp_authority)
if alias !~# ':'
return alias . ':' . path
elseif path =~# '^/'
return 'ssh://' . alias . path
else
return a:remote
endif
return a:remote
endfunction
function! s:ConfigLengthSort(i1, i2) abort