This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3518

remotenames: check the remotepath with url containing user information too
ClosedPublic

Authored by pulkit on May 10 2018, 9:29 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbbdc1bc56e58: remotenames: check the remotepath with url containing user information too
Summary

Current logic to match a remotepatch to a user defined path first removes the
authentication information from the url and then tries to match it. However this
is not true every time. If we clone a repo using ssh, the default path contains
the user information too.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/logexchange.py (4 lines)

Diff 8649

mercurial/logexchange.py

if local: if local:
rpath = remote._repo.root rpath = remote._repo.root
elif not isinstance(remote, bytes): elif not isinstance(remote, bytes):
rpath = remote._url rpath = remote._url
# represent the remotepath with user defined path name if exists # represent the remotepath with user defined path name if exists
for path, url in repo.ui.configitems('paths'): for path, url in repo.ui.configitems('paths'):
# remove auth info from user defined url # remove auth info from user defined url
url = util.removeauth(url) noauthurl = util.removeauth(url)
if url == rpath: if url == rpath or noauthurl == rpath:
rpath = path rpath = path
break break
return rpath return rpath
def pullremotenames(localrepo, remoterepo): def pullremotenames(localrepo, remoterepo):
""" """
pulls bookmarks and branches information of the remote repo during a pulls bookmarks and branches information of the remote repo during a