Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: back out c77c925987d7 to store bytes filename in IOError
authorYuya Nishihara <yuya@tcha.org>
Sat, 03 Mar 2018 15:33:52 -0500
changeset 36657 214f61abd865
parent 36656 5c4c9eb1feb6
child 36658 e1c6c1f9855d
py3: back out c77c925987d7 to store bytes filename in IOError Appears that this is how Python 3 works.
mercurial/lock.py file | annotate | diff | comparison | revisions
mercurial/statichttprepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/lock.py	Sat Mar 03 14:57:23 2018 -0500
+++ b/mercurial/lock.py	Sat Mar 03 15:33:52 2018 -0500
@@ -200,10 +200,9 @@
                         return
                     locker = self._testlock(locker)
                     if locker is not None:
-                        raise error.LockHeld(
-                            errno.EAGAIN,
-                            encoding.strfromlocal(self.vfs.join(self.f)),
-                            self.desc, locker)
+                        raise error.LockHeld(errno.EAGAIN,
+                                             self.vfs.join(self.f), self.desc,
+                                             locker)
                 else:
                     raise error.LockUnavailable(why.errno, why.strerror,
                                                 why.filename, self.desc)
@@ -212,8 +211,7 @@
             # use empty locker to mean "busy for frequent lock/unlock
             # by many processes"
             raise error.LockHeld(errno.EAGAIN,
-                                 encoding.strfromlocal(self.vfs.join(self.f)),
-                                 self.desc, "")
+                                 self.vfs.join(self.f), self.desc, "")
 
     def _readlock(self):
         """read lock and return its value
--- a/mercurial/statichttprepo.py	Sat Mar 03 14:57:23 2018 -0500
+++ b/mercurial/statichttprepo.py	Sat Mar 03 15:33:52 2018 -0500
@@ -206,7 +206,7 @@
         return statichttppeer(self)
 
     def wlock(self, wait=True):
-        raise error.LockUnavailable(0, _('lock not available'), r'lock',
+        raise error.LockUnavailable(0, _('lock not available'), 'lock',
                                     _('cannot lock static-http repository'))
 
     def lock(self, wait=True):
mercurial