D10176: hg: convert an exception to bytes in the repo creation exception handler
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Fri Mar 12 18:09:33 UTC 2021
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION 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])
REPOSITORY
rHG Mercurial
BRANCH
stable
REVISION DETAIL
https://phab.mercurial-scm.org/D10176
AFFECTED FILES
mercurial/hg.py
CHANGE DETAILS
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -41,7 +41,6 @@
mergestate as mergestatemod,
narrowspec,
phases,
- pycompat,
requirements,
scmutil,
sshpeer,
@@ -53,7 +52,11 @@
verify as verifymod,
vfs as vfsmod,
)
-from .utils import hashutil
+from .utils import (
+ hashutil,
+ stringutil,
+)
+
release = lock.release
@@ -74,7 +77,7 @@
# Python 2 raises TypeError, Python 3 ValueError.
except (TypeError, ValueError) as e:
raise error.Abort(
- _(b'invalid path %s: %s') % (path, pycompat.bytestr(e))
+ _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
)
except OSError:
isfile = False
To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list