Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 7640:7197812e8d44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: move lock errors rename LockException to LockError
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:09:14 -0600
parents 1d54e2f6c0b7
children d2f753830f80
comparison
equal deleted inserted replaced
7639:ae7a614a6a57 7640:7197812e8d44
635 self._branchcachetip = None 635 self._branchcachetip = None
636 636
637 def _lock(self, lockname, wait, releasefn, acquirefn, desc): 637 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
638 try: 638 try:
639 l = lock.lock(lockname, 0, releasefn, desc=desc) 639 l = lock.lock(lockname, 0, releasefn, desc=desc)
640 except lock.LockHeld, inst: 640 except error.LockHeld, inst:
641 if not wait: 641 if not wait:
642 raise 642 raise
643 self.ui.warn(_("waiting for lock on %s held by %r\n") % 643 self.ui.warn(_("waiting for lock on %s held by %r\n") %
644 (desc, inst.locker)) 644 (desc, inst.locker))
645 # default to 600 seconds timeout 645 # default to 600 seconds timeout
1021 try: 1021 try:
1022 try: 1022 try:
1023 wlock = self.wlock(False) 1023 wlock = self.wlock(False)
1024 for f in fixup: 1024 for f in fixup:
1025 self.dirstate.normal(f) 1025 self.dirstate.normal(f)
1026 except lock.LockException: 1026 except lock.LockError:
1027 pass 1027 pass
1028 finally: 1028 finally:
1029 del wlock 1029 del wlock
1030 1030
1031 if not parentworking: 1031 if not parentworking: