# HG changeset patch # User Matt Mackall # Date 1440440770 18000 # Node ID b188f60bd955e10ee6f91d5dd707bb5f633d2c9c # Parent 3b6e5914edd87b399f24d53d95785d34808f29b2 lock: make trylock private diff -r 3b6e5914edd8 -r b188f60bd955 mercurial/lock.py --- a/mercurial/lock.py Mon Aug 24 13:24:43 2015 -0500 +++ b/mercurial/lock.py Mon Aug 24 13:26:10 2015 -0500 @@ -65,7 +65,7 @@ timeout = self.timeout while True: try: - self.trylock() + self._trylock() return self.timeout - timeout except error.LockHeld as inst: if timeout != 0: @@ -76,7 +76,7 @@ raise error.LockHeld(errno.ETIMEDOUT, inst.filename, self.desc, inst.locker) - def trylock(self): + def _trylock(self): if self.held: self.held += 1 return