Mercurial > hg-stable
changeset 50063:2aacd560cf59
locking: take the `wlock` for the full `hg addremove` duration
Otherwise, there is a race condition window between the time we resolve the
file to addremove with the matcher and the time we lock the repo and modify the
dirstate.
For example, the working copy might have been updated away, or purged, and the
matched files would no longer be correct.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 13 Dec 2022 04:22:19 +0100 |
| parents | feaa5d08bb19 |
| children | e859f440daa9 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Dec 13 16:26:13 2022 +0100 +++ b/mercurial/commands.py Tue Dec 13 04:22:19 2022 +0100 @@ -331,10 +331,11 @@ opts = pycompat.byteskwargs(opts) if not opts.get(b'similarity'): opts[b'similarity'] = b'100' - matcher = scmutil.match(repo[None], pats, opts) - relative = scmutil.anypats(pats, opts) - uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative) - return scmutil.addremove(repo, matcher, b"", uipathfn, opts) + with repo.wlock(): + matcher = scmutil.match(repo[None], pats, opts) + relative = scmutil.anypats(pats, opts) + uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative) + return scmutil.addremove(repo, matcher, b"", uipathfn, opts) @command(