Mercurial > public > mercurial-scm > hg
comparison mercurial/lock.py @ 17683:6d7db5794e8c
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 29 Sep 2012 12:28:52 -0500 |
| parents | 31f32a96e1e3 829919ef894a |
| children | af9fa8d4c939 |
comparison
equal
deleted
inserted
replaced
| 17681:a41fd730f230 | 17683:6d7db5794e8c |
|---|---|
| 95 not alive, we can safely break lock. | 95 not alive, we can safely break lock. |
| 96 | 96 |
| 97 The lock file is only deleted when None is returned. | 97 The lock file is only deleted when None is returned. |
| 98 | 98 |
| 99 """ | 99 """ |
| 100 locker = util.readlock(self.f) | 100 try: |
| 101 locker = util.readlock(self.f) | |
| 102 except OSError, why: | |
| 103 if why.errno == errno.ENOENT: | |
| 104 return None | |
| 105 raise | |
| 101 try: | 106 try: |
| 102 host, pid = locker.split(":", 1) | 107 host, pid = locker.split(":", 1) |
| 103 except ValueError: | 108 except ValueError: |
| 104 return locker | 109 return locker |
| 105 if host != lock._host: | 110 if host != lock._host: |