motiejus/dotfiles

commit 485ce07c2794244be8a142046ca25cbb5512f7de (tree)
parent c29ef11cd6478da675678265e76f9e527843876f
Author: Tim Pope <code@tpope.net>
Date:   Fri, 11 Feb 2022 12:45:16 -0500

Match FugitiveRemote() interface to window.location in JS

Diffstat:
M
autoload/fugitive.vim
 | 
12
++++++++----
M
plugin/fugitive.vim
 | 
1
+

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -1254,6 +1254,14 @@ function! s:UrlParse(url) abort
       let url.path = empty(match[3]) ? '/' : match[3]
     endif
   endif
+  let url.protocol = substitute(url.scheme, '.\zs$', ':', '')
+  let url.user = matchstr(url.authority, '.\{-\}\ze@', '', '')
+  let url.host = substitute(url.authority, '.\{-\}@', '', '')
+  let url.hostname = substitute(url.host, ':\d\+$', '', '')
+  let url.port = matchstr(url.host, ':\zs\d\+$', '', '')
+  let url.origin = substitute(url.scheme, '.\zs$', '://', '') . url.host
+  let url.search = matchstr(url.path, '?.*')
+  let url.pathname = '/' . matchstr(url.path, '^/\=\zs[^?]*')
   if (url.scheme ==# 'ssh' || url.scheme ==# 'git') && url.path[0:1] ==# '/~'
     let url.path = strpart(url.path, 1)
   endif
@@ -1319,10 +1327,6 @@ function! s:RemoteCallback(config, into, flags, cb) abort
   else
     call extend(a:into, s:UrlParse(url))
   endif
-  let a:into.user = matchstr(a:into.authority, '.\{-\}\ze@', '', '')
-  let a:into.host = substitute(a:into.authority, '.\{-\}@', '', '')
-  let a:into.hostname = substitute(a:into.host, ':\d\+$', '', '')
-  let a:into.port = matchstr(a:into.host, ':\zs\d\+$', '', '')
   if len(a:cb)
     call call(a:cb[0], [a:into] + a:cb[1:-1])
   endif
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
@@ -217,6 +217,7 @@ endfunction
 " * "scheme": "https"
 " * "authority": "user@example.com:1234"
 " * "path": "/repo.git" (for SSH URLs this may be a relative path)
+" * "pathname": "/repo.git" (always coerced to absolute path)
 " * "host": "example.com:1234"
 " * "hostname": "example.com"
 " * "port": "1234"