mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
af11572e75
Summary: Sparse profiles should be roughly scoped around the files needed to work on a certain product. If an engineer needs to work on multiple products they should be able to enable multiple profiles. Previously, multiple v2 profiles would be combined into an ordered list of include/exclude rules, which meant that profiles enabled later could exclude files included by the earlier profiles. To fix this, let's treat each profile separately and create a matcher for each. We then combine these into a union matcher, which means we're guaranteed to have all the files that each profile specifies. Differential Revision: D30586161 fbshipit-source-id: 2e04cfdba670ffce381a7c041706f315775ad7b0
88 lines
1.7 KiB
Perl
88 lines
1.7 KiB
Perl
#chg-compatible
|
|
|
|
test sparse
|
|
|
|
$ enable sparse rebase
|
|
$ hg init myrepo
|
|
$ cd myrepo
|
|
|
|
$ echo z > file.txt
|
|
$ mkdir exc
|
|
$ mkdir -p inc/exc
|
|
$ echo z > exc/file.txt
|
|
$ echo z > inc/file.txt
|
|
$ echo z > inc/exc/incfile.txt
|
|
$ echo z > inc/exc/excfile.txt
|
|
$ cat > base.sparse <<EOF
|
|
> [include]
|
|
> glob:*.sparse
|
|
> path:file.txt
|
|
> path:inc/
|
|
> [exclude]
|
|
> path:inc/exc
|
|
> EOF
|
|
$ cat > main.sparse <<EOF
|
|
> %include base.sparse
|
|
> [include]
|
|
> path:inc/exc/incfile.txt
|
|
> EOF
|
|
$ hg ci -Aqm 'initial'
|
|
$ hg sparse enable main.sparse
|
|
|
|
# Verify inc/exc/incfile.txt is not included.
|
|
$ ls -R | grep -v :
|
|
base.sparse
|
|
file.txt
|
|
inc
|
|
main.sparse
|
|
|
|
file.txt
|
|
|
|
# Upgrade main.sparse to v2
|
|
$ cat > main.sparse <<EOF
|
|
> [metadata]
|
|
> version: 2
|
|
> %include base.sparse
|
|
> [include]
|
|
> inc/exc/incfile.txt
|
|
> EOF
|
|
$ hg commit -qm "v2 sparse"
|
|
|
|
# Verify inc/exc/incfile.txt is now included.
|
|
$ ls -R | grep -v :
|
|
base.sparse
|
|
file.txt
|
|
inc
|
|
main.sparse
|
|
|
|
exc
|
|
file.txt
|
|
|
|
incfile.txt
|
|
|
|
$ hg debugsparseprofilev2 main.sparse
|
|
V1 includes 4 files
|
|
V2 includes 5 files
|
|
+ inc/exc/incfile.txt
|
|
|
|
Test that multiple profiles do not clobber each others includes
|
|
# Exclude inc/exc/incfile.txt which main.sparse includes and
|
|
# include inc/exc/excfile.txt which main.sparse excludes. Verify they are now
|
|
# both present.
|
|
$ cat >> other.sparse <<EOF
|
|
> [include]
|
|
> inc/exc/excfile.txt
|
|
> [exclude]
|
|
> inc/exc/incfile.txt
|
|
> EOF
|
|
$ hg commit -Aqm 'other.sparse'
|
|
$ hg sparse enable other.sparse
|
|
$ find . -type f -not -wholename "**/.hg/**" | sort
|
|
./base.sparse
|
|
./file.txt
|
|
./inc/exc/excfile.txt
|
|
./inc/exc/incfile.txt
|
|
./inc/file.txt
|
|
./main.sparse
|
|
./other.sparse
|