diff mercurial/lock.py @ 36657:214f61abd865

py3: back out c77c925987d7 to store bytes filename in IOError

Appears that this is how Python 3 works.

--- 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