equal
deleted
inserted
replaced
2889 |
2889 |
2890 Use this before modifying files in .hg. |
2890 Use this before modifying files in .hg. |
2891 |
2891 |
2892 If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
2892 If both 'lock' and 'wlock' must be acquired, ensure you always acquires |
2893 'wlock' first to avoid a dead-lock hazard.""" |
2893 'wlock' first to avoid a dead-lock hazard.""" |
2894 l = self._wlockref and self._wlockref() |
2894 l = self._wlockref() if self._wlockref else None |
2895 if l is not None and l.held: |
2895 if l is not None and l.held: |
2896 l.lock() |
2896 l.lock() |
2897 return l |
2897 return l |
2898 |
2898 |
2899 # We do not need to check for non-waiting lock acquisition. Such |
2899 # We do not need to check for non-waiting lock acquisition. Such |