This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8335

url: pass str to pathname2url
ClosedPublic

Authored by indygreg on Mar 28 2020, 9:40 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe74af49aa3c9: url: pass str to pathname2url
Summary

This is needed to appease Python 3.

This fixes test-extdata.t and test-url-download.t on Python 3
on Windows.

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.

Event Timeline

indygreg created this revision.Mar 28 2020, 9:40 PM
pulkit accepted this revision.Mar 31 2020, 6:17 AM
This revision is now accepted and ready to land.Mar 31 2020, 6:17 AM
indygreg added a commit: rHGe74af49aa3c9: url: pass str to pathname2url.Apr 1 2020, 11:22 AM
Closed by commit rHGe74af49aa3c9: url: pass str to pathname2url (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/url.py (4 lines)

Diff 20940

mercurial/url.py

def open(ui, url_, data=None, sendaccept=True): def open(ui, url_, data=None, sendaccept=True):
u = util.url(url_) u = util.url(url_)
if u.scheme: if u.scheme:
u.scheme = u.scheme.lower() u.scheme = u.scheme.lower()
url_, authinfo = u.authinfo() url_, authinfo = u.authinfo()
else: else:
path = util.normpath(os.path.abspath(url_)) path = util.normpath(os.path.abspath(url_))
url_ = b'file://' + pycompat.bytesurl(urlreq.pathname2url(path)) url_ = b'file://' + pycompat.bytesurl(
urlreq.pathname2url(pycompat.fsdecode(path))
)
authinfo = None authinfo = None
return opener(ui, authinfo, sendaccept=sendaccept).open( return opener(ui, authinfo, sendaccept=sendaccept).open(
pycompat.strurl(url_), data pycompat.strurl(url_), data
) )
def wrapresponse(resp): def wrapresponse(resp):
"""Wrap a response object with common error handlers. """Wrap a response object with common error handlers.