motiejus/dotfiles

commit eaee845abaf75827cc3c6a3f96d7ff77a3a8beff (tree)
parent 6860c592adb8d1f5df548689d3352e61224776b2
Author: Tim Pope <code@tpope.net>
Date:   Thu, 25 Mar 2021 11:57:17 -0400

Unify remote resolution

HTTP redirects and SSH host aliases are just different manifestations of
the same indirection, so handle them both in FugitiveRemoteUrl().  Also
make this function idempotent if a URL is passed in, and pass some
sensible options to cURL.

Diffstat:
M
autoload/fugitive.vim
 | 
48
+++++++++++++++++++++++++++---------------------

1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -659,18 +659,37 @@ function! fugitive#SshHostAlias(...) abort
   endif
 endfunction
 
+let s:redirects = {}
+
+function! fugitive#ResolveRemote(remote) abort
+  if a:remote =~# '^https\=://' && s:executable('curl')
+    if !has_key(s:redirects, a:remote)
+      let s:redirects[a:remote] = matchstr(s:SystemError(
+            \ 'curl --disable --silent --max-time 5 -I ' .
+            \ s:shellesc(a:remote . '/info/refs?service=git-upload-pack'))[0],
+            \ 'Location: \zs\S\+\ze/info/refs?')
+    endif
+    if len(s:redirects[a:remote])
+      return s:redirects[a:remote]
+    endif
+  endif
+  return substitute(a:remote,
+        \ '^ssh://\%([^@:/]\+@\)\=\zs[^/:]\+\|^\%([^@:/]\+@\)\=\zs[^/:]\+\ze:/\@!',
+        \ '\=fugitive#SshHostAlias(submatch(0))', '')
+endfunction
+
 function! fugitive#RemoteUrl(...) abort
   let dir = a:0 > 1 ? a:2 : s:Dir()
-  let remote = !a:0 || a:1 =~# '^\.\=$' ? s:Remote(dir) : a:1
-  if !fugitive#GitVersion(2, 7)
-    let url = FugitiveConfigGet('remote.' . remote . '.url')
-  else
-    let url = s:ChompDefault('', [dir, 'remote', 'get-url', remote, '--'])
+  let url = !a:0 || a:1 =~# '^\.\=$' ? s:Remote(dir) : a:1
+  if url !~# ':\|^/\|^\.\.\=/'
+    if !fugitive#GitVersion(2, 7)
+      let url = FugitiveConfigGet('remote.' . url . '.url')
+    else
+      let url = s:ChompDefault('', [dir, 'remote', 'get-url', url, '--'])
+    endif
   endif
   if !get(a:, 3, 0)
-    let url = substitute(url,
-          \ '^ssh://\%([^@:/]\+@\)\=\zs[^/:]\+\|^\%([^@:/]\+@\)\=\zs[^/:]\+\ze:/\@!',
-          \ '\=fugitive#SshHostAlias(submatch(0))', '')
+    let url = fugitive#ResolveRemote(url)
   endif
   return url
 endfunction
@@ -5859,8 +5878,6 @@ augroup END
 
 " Section: :GBrowse
 
-let s:redirects = {}
-
 function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abort
   let dir = s:Dir()
   exe s:DirCheck(dir)
@@ -6032,17 +6049,6 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
       let raw = remote
     endif
 
-    if raw =~# '^https\=://' && s:executable('curl')
-      if !has_key(s:redirects, raw)
-        let s:redirects[raw] = matchstr(system('curl -I ' .
-              \ s:shellesc(raw . '/info/refs?service=git-upload-pack')),
-              \ 'Location: \zs\S\+\ze/info/refs?')
-      endif
-      if len(s:redirects[raw])
-        let raw = s:redirects[raw]
-      endif
-    endif
-
     let opts = {
           \ 'dir': dir,
           \ 'repo': fugitive#repo(dir),