Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 26781:1aee2ab0f902
spelling: trivial spell checking
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 17 Oct 2015 00:58:46 +0200 |
| parents | 69a121c378ef |
| children | 0a7610758c42 |
comparison
equal
deleted
inserted
replaced
| 26780:bbf544b5f2e9 | 26781:1aee2ab0f902 |
|---|---|
| 1304 l = self._wlockref and self._wlockref() | 1304 l = self._wlockref and self._wlockref() |
| 1305 if l is not None and l.held: | 1305 if l is not None and l.held: |
| 1306 l.lock() | 1306 l.lock() |
| 1307 return l | 1307 return l |
| 1308 | 1308 |
| 1309 # We do not need to check for non-waiting lock aquisition. Such | 1309 # We do not need to check for non-waiting lock acquisition. Such |
| 1310 # acquisition would not cause dead-lock as they would just fail. | 1310 # acquisition would not cause dead-lock as they would just fail. |
| 1311 if wait and (self.ui.configbool('devel', 'all-warnings') | 1311 if wait and (self.ui.configbool('devel', 'all-warnings') |
| 1312 or self.ui.configbool('devel', 'check-locks')): | 1312 or self.ui.configbool('devel', 'check-locks')): |
| 1313 l = self._lockref and self._lockref() | 1313 l = self._lockref and self._lockref() |
| 1314 if l is not None and l.held: | 1314 if l is not None and l.held: |