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.
narrow: widen when files are excluded by sparse and not included by narrow
authorCharles Chamberlain <cchamberlain@janestreet.com>
Tue, 18 May 2021 13:08:42 -0400
changeset 47303 e4ccc341e65b
parent 47302 338623a2ebf2
child 47304 73f52278a158
narrow: widen when files are excluded by sparse and not included by narrow In a repo where some directories are included by narrow and the complement are excluded by sparse, it was previously impossible to widen either because trying to widen narrow would complain that the requested files are outside the sparse checkout and trying to widen sparse would complain that the requested files are outside the narrow checkout. This changes the `hg tracked --addinclude` command to only actually update any newly accessible files in the dirstate if they are also accessible via sparse. Differential Revision: https://phab.mercurial-scm.org/D10734
mercurial/narrowspec.py file | annotate | diff | comparison | revisions
tests/test-narrow-sparse.t file | annotate | diff | comparison | revisions 
--- a/mercurial/narrowspec.py	Tue May 18 13:34:06 2021 -0400
+++ b/mercurial/narrowspec.py	Tue May 18 13:08:42 2021 -0400
@@ -346,6 +346,9 @@
         ds.drop(f)
 
     pctx = repo[b'.']
+
+    # only update added files that are in the sparse checkout
+    addedmatch = matchmod.intersectmatchers(addedmatch, sparse.matcher(repo))
     newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds]
     for f in newfiles:
         ds.normallookup(f)
--- a/tests/test-narrow-sparse.t	Tue May 18 13:34:06 2021 -0400
+++ b/tests/test-narrow-sparse.t	Tue May 18 13:08:42 2021 -0400
@@ -70,3 +70,28 @@
   treemanifest (tree !)
 
   $ hg debugrebuilddirstate
+
+We only make the following assertions for the flat test case since in the
+treemanifest test case debugsparse fails with "path ends in directory
+separator: outside/" which seems like a bug unrelated to the regression this is
+testing for.
+
+#if flat
+widening with both sparse and narrow is possible
+
+  $ cat >> .hg/hgrc <<EOF
+  > [extensions]
+  > sparse = 
+  > narrow = 
+  > EOF
+
+  $ hg debugsparse -X outside/f -X widest/f
+  $ hg tracked -q --addinclude outside/f
+  $ find . -name .hg -prune -o -type f -print | sort
+  ./inside/f
+
+  $ hg debugsparse -d outside/f
+  $ find . -name .hg -prune -o -type f -print | sort
+  ./inside/f
+  ./outside/f
+#endif
mercurial