This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8302

hg: make _local() behave consistently on Python 3.8 (issue6287)
ClosedPublic

Authored by durin42 on Mar 18 2020, 3:20 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6a8738dc4a01: hg: make _local() behave consistently on Python 3.8 (issue6287)
Summary

Python 3.8 makes os.path.isfile quietly eat "path invalid" errors and
return False instead of allowing the exception to propagate. Given
that this is a change from 2018 (sigh) and it's mentioned in the
release notes (double sigh) we're definitely too late to complain to
Python about the behavior change, so open-code part of
os.path.isfile() in this method so we can catch invalid-path errors
and handle them appropriately. I confirmed that posixpath and ntpath
both delegate to genericpath, which uses os.stat() under the covers.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Mar 18 2020, 3:20 PM
durin42 retitled this revision from hg: make _local() behave consistently on Python 3.8 to hg: make _local() behave consistently on Python 3.8 (issue6287).Mar 18 2020, 3:26 PM
durin42 updated this revision to Diff 20827.
pulkit accepted this revision.Mar 19 2020, 4:06 AM
This revision is now accepted and ready to land.Mar 19 2020, 4:06 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (9 lines)

Diff 20827

mercurial/hg.py

# shared features # shared features
sharedbookmarks = b'bookmarks' sharedbookmarks = b'bookmarks'
def _local(path): def _local(path):
path = util.expandpath(util.urllocalpath(path)) path = util.expandpath(util.urllocalpath(path))
try: try:
isfile = os.path.isfile(path) # we use os.stat() directly here instead of os.path.isfile()
# because the latter started returning `False` on invalid path
# exceptions starting in 3.8 and we care about handling
# invalid paths specially here.
st = os.stat(path)
isfile = stat.S_ISREG(st.st_mode)
# Python 2 raises TypeError, Python 3 ValueError. # Python 2 raises TypeError, Python 3 ValueError.
except (TypeError, ValueError) as e: except (TypeError, ValueError) as e:
raise error.Abort( raise error.Abort(
_(b'invalid path %s: %s') % (path, pycompat.bytestr(e)) _(b'invalid path %s: %s') % (path, pycompat.bytestr(e))
) )
except OSError:
isfile = False
return isfile and bundlerepo or localrepo return isfile and bundlerepo or localrepo
def addbranchrevs(lrepo, other, branches, revs): def addbranchrevs(lrepo, other, branches, revs):
peer = other.peer() # a courtesy to callers using a localrepo for other peer = other.peer() # a courtesy to callers using a localrepo for other
hashbranch, branches = branches hashbranch, branches = branches
if not hashbranch and not branches: if not hashbranch and not branches: