Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 51641:69c5f8d6c710
branching: merge stable into default
author | Rapha?l Gom?s <rgomes@octobus.net> |
---|---|
date | Wed, 12 Jun 2024 11:29:11 +0200 |
parents | 6378d57562af fcc149f3fdcb |
children | c10fa6388dbf |
line wrap: on
line diff
--- a/mercurial/localrepo.py Wed Sep 06 18:23:32 2023 +0200 +++ b/mercurial/localrepo.py Wed Jun 12 11:29:11 2024 +0200 @@ -3122,6 +3122,7 @@ l.lock() return l + self.hook(b'prelock', throw=True) l = self._lock( vfs=self.svfs, lockname=b"lock", @@ -3146,6 +3147,7 @@ l.lock() return l + self.hook(b'prewlock', throw=True) # We do not need to check for non-waiting lock acquisition. Such # acquisition would not cause dead-lock as they would just fail. if wait and (