Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1754:fdfe89a3962d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use repo.lock when cloning via copy, use lock.LockException when necessary
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 20 Feb 2006 01:12:03 +0100
parents 457cdec745f8
children b9671b41e360
comparison
equal deleted inserted replaced
1753:e6e70450edb9 1754:fdfe89a3962d
506 # are we comparing the working directory? 506 # are we comparing the working directory?
507 if not node2: 507 if not node2:
508 if not wlock: 508 if not wlock:
509 try: 509 try:
510 wlock = self.wlock(wait=0) 510 wlock = self.wlock(wait=0)
511 except lock.LockHeld: 511 except lock.LockException:
512 wlock = None 512 wlock = None
513 lookup, modified, added, removed, deleted, unknown = ( 513 lookup, modified, added, removed, deleted, unknown = (
514 self.dirstate.changes(files, match)) 514 self.dirstate.changes(files, match))
515 515
516 # are we comparing working dir against its parent? 516 # are we comparing working dir against its parent?