equal
deleted
inserted
replaced
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? |