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.
sparse: clear rules in the context of a `parentchanges` context
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 08 Jul 2021 19:06:32 +0200
changeset 47606 26bf0b9fe78f
parent 47605 a5701ffc10e4
child 47607 ff82edadc2e1
sparse: clear rules in the context of a `parentchanges` context This is the same logic as the change we did for narrow. Differential Revision: https://phab.mercurial-scm.org/D11029
mercurial/sparse.py file | annotate | diff | comparison | revisions 
--- a/mercurial/sparse.py	Thu Jul 08 18:59:55 2021 +0200
+++ b/mercurial/sparse.py	Thu Jul 08 19:06:32 2021 +0200
@@ -630,7 +630,7 @@
     The remaining sparse config only has profiles, if defined. The working
     directory is refreshed, as needed.
     """
-    with repo.wlock():
+    with repo.wlock(), repo.dirstate.parentchange():
         raw = repo.vfs.tryread(b'sparse')
         includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse')
 
@@ -708,7 +708,7 @@
 
     The new config is written out and a working directory refresh is performed.
     """
-    with repo.wlock():
+    with repo.wlock(), repo.dirstate.parentchange():
         raw = repo.vfs.tryread(b'sparse')
         oldinclude, oldexclude, oldprofiles = parseconfig(
             repo.ui, raw, b'sparse'
mercurial