From 2c0ba03a59a3932690bf5bfd741fc02fbb5283c2 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Thu, 15 Oct 2015 16:04:15 -0700 Subject: [PATCH] init: wrap hgutil.url so that we can use isgitsshuri Previously, cloning from a git ssh uri (e.g. git@github.com:user/repo.git) would prepend the local file path because Mercurial classifies this as a path (since there is no scheme at the beginning of the string). This patch fixes that by doing the same logic as before in hgutil.url so that the correct hgrc path is written. --- hggit/__init__.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hggit/__init__.py b/hggit/__init__.py index d149cbb8cc..46da3d6822 100644 --- a/hggit/__init__.py +++ b/hggit/__init__.py @@ -128,6 +128,26 @@ def _local(path): hg.schemes['file'] = _local +# we need to wrap this so that git-like ssh paths are not prepended with a +# local filesystem path. ugh. +def _url(orig, path, **kwargs): + # we'll test for 'git@' then use our heuristic method to determine if it's + # a git uri + if not (path.startswith(os.sep) and ':' in path): + return orig(path, **kwargs) + + # the file path will be everything up until the last slash right before the + # ':' + lastsep = path.rindex(os.sep, None, path.index(':')) + 1 + gituri = path[lastsep:] + + if util.isgitsshuri(gituri): + return orig(gituri, **kwargs) + return orig(path, **kwargs) + +extensions.wrapfunction(hgutil, 'url', _url) + + def _httpgitwrapper(orig): # we should probably test the connection but for now, we just keep it # simple and check for a url ending in '.git'