comparison hgext/lfs/blobstore.py @ 37565:9c7a25ef5b49

lfs: handle paths that don't end with '/' when inferring the blob store

While here, I also checked the lfs.url config directly instead of testing the
scheme, as requested by Yuya.

37564:31a4ea773369

    adjustments as git.  As an extension, 'http' is supported as well so that
    ``hg serve`` works out of the box.

    https://github.com/git-lfs/git-lfs/blob/master/docs/api/server-discovery.md
    """
    url = util.url(repo.ui.config('lfs', 'url') or '')
    if url.scheme is None:
        if remote:
            defaulturl = util.url(remote)
        elif util.safehasattr(repo, '_subtoppath'):
            # The pull command sets this during the optional update phase, which
            # tells exactly where the pull originated, whether 'paths.default'
            # or explicit.
            defaulturl = util.url(repo._subtoppath)
        else:
            # TODO: investigate 'paths.remote:lfsurl' style path customization,
            # and fall back to inferring from 'paths.remote' if unspecified.
            defaulturl = util.url(repo.ui.config('paths', 'default') or b'')

        # TODO: support local paths as well.
        # TODO: consider the ssh -> https transformation that git applies
        if defaulturl.scheme in (b'http', b'https'):
            defaulturl.path = defaulturl.path or b'' + b'.git/info/lfs'

            url = util.url(bytes(defaulturl))
            repo.ui.note(_('lfs: assuming remote store: %s\n') % url)

37565:9c7a25ef5b49

    adjustments as git.  As an extension, 'http' is supported as well so that
    ``hg serve`` works out of the box.

    https://github.com/git-lfs/git-lfs/blob/master/docs/api/server-discovery.md
    """
    lfsurl = repo.ui.config('lfs', 'url')
    url = util.url(lfsurl or '')
    if lfsurl is None:
        if remote:
            path = remote
        elif util.safehasattr(repo, '_subtoppath'):
            # The pull command sets this during the optional update phase, which
            # tells exactly where the pull originated, whether 'paths.default'
            # or explicit.
            path = repo._subtoppath
        else:
            # TODO: investigate 'paths.remote:lfsurl' style path customization,
            # and fall back to inferring from 'paths.remote' if unspecified.
            path = repo.ui.config('paths', 'default') or ''

        defaulturl = util.url(path)

        # TODO: support local paths as well.
        # TODO: consider the ssh -> https transformation that git applies
        if defaulturl.scheme in (b'http', b'https'):
            if defaulturl.path and defaulturl.path[:-1] != b'/':
                defaulturl.path += b'/'
            defaulturl.path = defaulturl.path or b'' + b'.git/info/lfs'

            url = util.url(bytes(defaulturl))
            repo.ui.note(_('lfs: assuming remote store: %s\n') % url)