This is an archive of the discontinued Mercurial Phabricator instance.

Differential D938

remotenames: move utility functions to join and split names to core
AbandonedPublic

Authored by pulkit on Oct 4 2017, 5:53 PM.

Details

Reviewers
ryanmce
Group Reviewers
hg-reviewers
Summary

The functions splitremotename and joinremotename are moved to core from
remotenames extension.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 4 2017, 5:53 PM
ryanmce requested changes to this revision.Oct 12 2017, 8:31 AM
ryanmce added a subscriber: ryanmce.
ryanmce added inline comments.
mercurial/remotenames.py
10–19

As you mentioned when we chatted, this doesn't work great because the remote path can have a / character in it, eg:

$ hg paths
com/mon = https://www.mercurial-scm.org/repo/hg-committed/

And then this whole thing breaks. So we need to think about a better storage mechanism.

I would suggest JSON as one possibility since it already takes care of all encoding problems, and allows nested information that's straightforward to manipulate.

This revision now requires changes to proceed.Oct 12 2017, 8:31 AM
pulkit abandoned this revision.Oct 17 2017, 7:19 PM

Will revisit after the freeze.

Revision Contents
Changeset List

PathPackages
Mmercurial/remotenames.py (11 lines)

Diff 2435

mercurial/remotenames.py

# remotenames.py # remotenames.py
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
def splitremotename(remote):
name = ''
if '/' in remote:
remote, name = remote.split('/', 1)
return remote, name
def joinremotename(remote, ref):
if ref:
remote += '/' + ref
return remote
ryanmceUnsubmitted
Not Done

As you mentioned when we chatted, this doesn't work great because the remote path can have a / character in it, eg:

$ hg paths
com/mon = https://www.mercurial-scm.org/repo/hg-committed/

And then this whole thing breaks. So we need to think about a better storage mechanism.

I would suggest JSON as one possibility since it already takes care of all encoding problems, and allows nested information that's straightforward to manipulate.

ryanmce: As you mentioned when we chatted, this doesn't work great because the remote path can have a…
def pullremotenames(localrepo, remoterepo, remotepath): def pullremotenames(localrepo, remoterepo, remotepath):
""" pulls bookmarks and branches information of the remote repo during a """ pulls bookmarks and branches information of the remote repo during a
pull or clone operation. pull or clone operation.
localrepo is our local repository localrepo is our local repository
remoterepo is the repo from which we are pulling or cloning remoterepo is the repo from which we are pulling or cloning
remotepath is the path of the remote repository remotepath is the path of the remote repository
""" """
bookmarks = remoterepo.listkeys('bookmarks') bookmarks = remoterepo.listkeys('bookmarks')