Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
locking: take the `wlock` for the full `hg add` duration
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 13 Dec 2022 04:21:27 +0100
changeset 50004 3c34a224c232
parent 50003 f4eef08575ce
child 50005 16b78c0de506
locking: take the `wlock` for the full `hg add` duration Otherwise, there is a race condition window between the time we resolve the file to add 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.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Mon Feb 06 01:22:01 2023 +0100
+++ b/mercurial/commands.py	Tue Dec 13 04:21:27 2022 +0100
@@ -252,10 +252,11 @@
     Returns 0 if all files are successfully added.
     """
 
-    m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
-    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
-    rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
-    return rejected and 1 or 0
+    with repo.wlock():
+        m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
+        uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
+        rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
+        return rejected and 1 or 0
 
 
 @command(
mercurial