This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10176

hg: convert an exception to bytes in the repo creation exception handler
ClosedPublic

Authored by mharbison72 on Mar 12 2021, 1:08 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1099541b6462: hg: convert an exception to bytes in the repo creation exception handler
Summary

Caught by pytype:

File "/mnt/c/Users/Matt/hg/mercurial/hg.py", line 77, in _local: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: Union[TypeError, ValueError])

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/hg.py (9 lines)

Diff 26466

mercurial/hg.py

localrepo, localrepo,
lock, lock,
logcmdutil, logcmdutil,
logexchange, logexchange,
merge as mergemod, merge as mergemod,
mergestate as mergestatemod, mergestate as mergestatemod,
narrowspec, narrowspec,
phases, phases,
pycompat,
requirements, requirements,
scmutil, scmutil,
sshpeer, sshpeer,
statichttprepo, statichttprepo,
ui as uimod, ui as uimod,
unionrepo, unionrepo,
url, url,
util, util,
verify as verifymod, verify as verifymod,
vfs as vfsmod, vfs as vfsmod,
) )
from .utils import hashutil from .utils import (
hashutil,
stringutil,
)
release = lock.release release = lock.release
# 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:
# we use os.stat() directly here instead of os.path.isfile() # we use os.stat() directly here instead of os.path.isfile()
# because the latter started returning `False` on invalid path # because the latter started returning `False` on invalid path
# exceptions starting in 3.8 and we care about handling # exceptions starting in 3.8 and we care about handling
# invalid paths specially here. # invalid paths specially here.
st = os.stat(path) st = os.stat(path)
isfile = stat.S_ISREG(st.st_mode) 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, stringutil.forcebytestr(e))
) )
except OSError: except OSError:
isfile = False 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):