##// END OF EJS Templates
py3: back out c77c925987d7 to store bytes filename in IOError...
Yuya Nishihara -
r36675:214f61ab default
parent child Browse files
Show More
@@ -200,10 +200,9 b' class lock(object):'
200 return
200 return
201 locker = self._testlock(locker)
201 locker = self._testlock(locker)
202 if locker is not None:
202 if locker is not None:
203 raise error.LockHeld(
203 raise error.LockHeld(errno.EAGAIN,
204 errno.EAGAIN,
204 self.vfs.join(self.f), self.desc,
205 encoding.strfromlocal(self.vfs.join(self.f)),
205 locker)
206 self.desc, locker)
207 else:
206 else:
208 raise error.LockUnavailable(why.errno, why.strerror,
207 raise error.LockUnavailable(why.errno, why.strerror,
209 why.filename, self.desc)
208 why.filename, self.desc)
@@ -212,8 +211,7 b' class lock(object):'
212 # use empty locker to mean "busy for frequent lock/unlock
211 # use empty locker to mean "busy for frequent lock/unlock
213 # by many processes"
212 # by many processes"
214 raise error.LockHeld(errno.EAGAIN,
213 raise error.LockHeld(errno.EAGAIN,
215 encoding.strfromlocal(self.vfs.join(self.f)),
214 self.vfs.join(self.f), self.desc, "")
216 self.desc, "")
217
215
218 def _readlock(self):
216 def _readlock(self):
219 """read lock and return its value
217 """read lock and return its value
@@ -206,7 +206,7 b' class statichttprepository(localrepo.loc'
206 return statichttppeer(self)
206 return statichttppeer(self)
207
207
208 def wlock(self, wait=True):
208 def wlock(self, wait=True):
209 raise error.LockUnavailable(0, _('lock not available'), r'lock',
209 raise error.LockUnavailable(0, _('lock not available'), 'lock',
210 _('cannot lock static-http repository'))
210 _('cannot lock static-http repository'))
211
211
212 def lock(self, wait=True):
212 def lock(self, wait=True):
General Comments 0
You need to be logged in to leave comments. Login now