facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 14:58:03 +03:00
Code Issues Projects Releases Wiki Activity

treestate: enable by default

Browse Source 
Summary:
Enable it by default so all tests run with it.

The test changes are mostly caused by repo requirement changes.

Reviewed By: DurhamG

Differential Revision: D8880991

fbshipit-source-id: f96cecfd85b8088098c3b55d06ab0374ee93437b
This commit is contained in:
Jun Wu 2018-07-27 17:58:22 -07:00 committed by Facebook Github Bot
parent 5ee658c927
commit af17261b14
36 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/configitems.py
View File

@ -290,7 +290,7 @@ coreconfigitem(
"format", "cgdeltabase", default="default" # changegroup.CFG_CGDELTA_DEFAULT "format", "cgdeltabase", default="default" # changegroup.CFG_CGDELTA_DEFAULT
) )
coreconfigitem("format", "chunkcachesize", default=None) coreconfigitem("format", "chunkcachesize", default=None)
coreconfigitem("format", "dirstate", default=1) coreconfigitem("format", "dirstate", default=2)
coreconfigitem("format", "dotencode", default=True) coreconfigitem("format", "dotencode", default=True)
coreconfigitem("format", "generaldelta", default=False) coreconfigitem("format", "generaldelta", default=False)
coreconfigitem("format", "manifestcachesize", default=None) coreconfigitem("format", "manifestcachesize", default=None)

1
tests/test-addremove-similar.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ hg init rep; cd rep $ hg init rep; cd rep
$ touch empty-file $ touch empty-file

1
tests/test-backout.t
View File

@ -1,5 +1,4 @@
$ . helpers-usechg.sh $ . helpers-usechg.sh
$ setconfig format.dirstate=2
$ hg init basic $ hg init basic
$ cd basic $ cd basic

1
tests/test-bundle.t
View File

@ -215,6 +215,7 @@ Make sure bundlerepo doesn't leak tempfiles (issue2491)
cache cache
requires requires
store store
treestate
Pull ../full.hg into empty (with hook) Pull ../full.hg into empty (with hook)

1
tests/test-commit-amend.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh $ . helpers-usechg.sh
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH

2
tests/test-empty.t
View File

@ -22,6 +22,7 @@ Check the basic files created:
00changelog.i 00changelog.i
requires requires
store store
treestate
Should be empty: Should be empty:
@ -45,6 +46,7 @@ Poke at a clone:
hgrc hgrc
requires requires
store store
treestate
Should be empty: Should be empty:

1
tests/test-fb-hgext-perftweaks.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]

6
tests/test-fb-hgext-remotefilelog-clone-tree.t
View File

@ -31,8 +31,8 @@
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate
treemanifest treemanifest
treestate
$ find .hg/store/meta | sort $ find .hg/store/meta | sort
.hg/store/meta .hg/store/meta
.hg/store/meta/_a .hg/store/meta/_a
@ -72,8 +72,8 @@
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate
treemanifest treemanifest
treestate
$ ls .hg/store/data $ ls .hg/store/data
ca31988f085bfb945cb8115b78fabdee40f741aa ca31988f085bfb945cb8115b78fabdee40f741aa
@ -115,5 +115,5 @@
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate
treemanifest treemanifest
treestate

6
tests/test-fb-hgext-remotefilelog-clone.t
View File

@ -28,7 +28,7 @@
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate treestate
$ hg update $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -62,7 +62,7 @@
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate treestate
$ ls .hg/store/data $ ls .hg/store/data
4a0a19218e082a343a1b17e5333409af9d98f0f5 4a0a19218e082a343a1b17e5333409af9d98f0f5
@ -112,4 +112,4 @@ check its contents separately.
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate treestate

2
tests/test-fb-hgext-remotefilelog-log.t
View File

@ -31,7 +31,7 @@ Shallow clone from full
remotefilelog remotefilelog
revlogv1 revlogv1
store store
treedirstate treestate
$ hg update $ hg update
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved

1
tests/test-fb-hgext-sparse-extensions.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
test sparse interaction with other extensions test sparse interaction with other extensions

1
tests/test-fb-hgext-sparse.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
test sparse test sparse
$ hg init myrepo $ hg init myrepo

1
tests/test-fb-hgext-treedirstate.t
View File

@ -1,5 +1,6 @@
Setup Setup
$ setconfig format.dirstate=1
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo base > base $ echo base > base

1
tests/test-fncache.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
Init repo1: Init repo1:

1
tests/test-graft.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh $ . helpers-usechg.sh
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF

1
tests/test-hardlinks.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
#require hardlink #require hardlink

1
tests/test-hgext-repogenerator.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ newrepo $ newrepo
$ setconfig repogenerator.filenamedircount=2 $ setconfig repogenerator.filenamedircount=2
$ setconfig repogenerator.filenameleaflength=1 $ setconfig repogenerator.filenameleaflength=1

1
tests/test-hgignore.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ hg init ignorerepo $ hg init ignorerepo
$ cd ignorerepo $ cd ignorerepo

1
tests/test-import.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh $ . helpers-usechg.sh
$ hg init a $ hg init a

7
tests/test-inherit-mode.t
View File

@ -72,8 +72,6 @@ new directories are setgid
00660 ./.hg/cache/rbc-names-v1 00660 ./.hg/cache/rbc-names-v1
00660 ./.hg/cache/rbc-revs-v1 00660 ./.hg/cache/rbc-revs-v1
00660 ./.hg/dirstate 00660 ./.hg/dirstate
00600 ./.hg/dirstate.tree.* (glob)
00660 ./.hg/fsmonitor.state (fsmonitor !)
00660 ./.hg/last-message.txt 00660 ./.hg/last-message.txt
00600 ./.hg/requires 00600 ./.hg/requires
00770 ./.hg/store/ 00770 ./.hg/store/
@ -88,6 +86,8 @@ new directories are setgid
00660 ./.hg/store/undo 00660 ./.hg/store/undo
00660 ./.hg/store/undo.backupfiles 00660 ./.hg/store/undo.backupfiles
00660 ./.hg/store/undo.phaseroots 00660 ./.hg/store/undo.phaseroots
00700 ./.hg/treestate/
00600 ./.hg/treestate/* (glob)
00660 ./.hg/undo.backup.dirstate 00660 ./.hg/undo.backup.dirstate
00660 ./.hg/undo.bookmarks 00660 ./.hg/undo.bookmarks
00660 ./.hg/undo.branch 00660 ./.hg/undo.branch
@ -121,7 +121,6 @@ group can still write everything
00770 ../push/.hg/cache/ 00770 ../push/.hg/cache/
00660 ../push/.hg/cache/branch2-base 00660 ../push/.hg/cache/branch2-base
00660 ../push/.hg/dirstate 00660 ../push/.hg/dirstate
00600 ../push/.hg/dirstate.tree.* (glob)
00660 ../push/.hg/requires 00660 ../push/.hg/requires
00770 ../push/.hg/store/ 00770 ../push/.hg/store/
00660 ../push/.hg/store/00changelog.i 00660 ../push/.hg/store/00changelog.i
@ -134,6 +133,8 @@ group can still write everything
00660 ../push/.hg/store/undo 00660 ../push/.hg/store/undo
00660 ../push/.hg/store/undo.backupfiles 00660 ../push/.hg/store/undo.backupfiles
00660 ../push/.hg/store/undo.phaseroots 00660 ../push/.hg/store/undo.phaseroots
00700 ../push/.hg/treestate/
00600 ../push/.hg/treestate/* (glob)
00660 ../push/.hg/undo.bookmarks 00660 ../push/.hg/undo.bookmarks
00660 ../push/.hg/undo.branch 00660 ../push/.hg/undo.branch
00660 ../push/.hg/undo.desc 00660 ../push/.hg/undo.desc

16
tests/test-init.t
View File

@ -30,7 +30,7 @@ creating 'local'
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
$ echo this > local/foo $ echo this > local/foo
$ hg ci --cwd local -A -m "init" $ hg ci --cwd local -A -m "init"
adding foo adding foo
@ -66,7 +66,7 @@ creating repo with format.usestore=false
$ checknewrepo old $ checknewrepo old
generaldelta generaldelta
revlogv1 revlogv1
treedirstate treestate
creating repo with format.usefncache=false creating repo with format.usefncache=false
@ -77,7 +77,7 @@ creating repo with format.usefncache=false
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
creating repo with format.dotencode=false creating repo with format.dotencode=false
@ -89,7 +89,7 @@ creating repo with format.dotencode=false
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
creating repo with format.dotencode=false creating repo with format.dotencode=false
@ -101,7 +101,7 @@ creating repo with format.dotencode=false
fncache fncache
revlogv1 revlogv1
store store
treedirstate treestate
test failure test failure
@ -215,7 +215,7 @@ creating 'local/sub/repo'
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
prepare test of init of url configured from paths prepare test of init of url configured from paths
@ -234,7 +234,7 @@ init should (for consistency with clone) expand the url
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
verify that clone also expand urls verify that clone also expand urls
@ -249,7 +249,7 @@ verify that clone also expand urls
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
clone bookmarks clone bookmarks

1
tests/test-issue660.t
View File

@ -1,5 +1,4 @@
$ setconfig format.dirstate=2
https://bz.mercurial-scm.org/660 and: https://bz.mercurial-scm.org/660 and:
https://bz.mercurial-scm.org/322 https://bz.mercurial-scm.org/322

1
tests/test-locate.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo 0 > a $ echo 0 > a

10
tests/test-lz4revlog.t
View File

@ -29,7 +29,7 @@ regular clone of an existing zlib repo should still use zlib
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
pulled clone of zlib should use lz4 pulled clone of zlib should use lz4
@ -41,7 +41,7 @@ pulled clone of zlib should use lz4
lz4revlog lz4revlog
revlogv1 revlogv1
store store
treedirstate treestate
disable lz4, then clone disable lz4, then clone
@ -60,7 +60,7 @@ disable lz4, then clone
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
attempt to disable lz4 should be ignored for hardlinked clone attempt to disable lz4 should be ignored for hardlinked clone
@ -74,7 +74,7 @@ attempt to disable lz4 should be ignored for hardlinked clone
lz4revlog lz4revlog
revlogv1 revlogv1
store store
treedirstate treestate
a new repo should use lz4 by default a new repo should use lz4 by default
@ -102,7 +102,7 @@ a new repo should use lz4 by default
lz4revlog lz4revlog
revlogv1 revlogv1
store store
treedirstate treestate
vanilla hg should bail in an lz4 repo vanilla hg should bail in an lz4 repo

1
tests/test-merge-force.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh $ . helpers-usechg.sh
Set up a base, local, and remote changeset, as well as the working copy state. Set up a base, local, and remote changeset, as well as the working copy state.

1
tests/test-merge-remove.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh $ . helpers-usechg.sh
$ hg init $ hg init

1
tests/test-merge1.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ . helpers-usechg.sh $ . helpers-usechg.sh
$ cat <<EOF > merge $ cat <<EOF > merge

1
tests/test-mq.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ checkundo() $ checkundo()
> { > {

1
tests/test-pathconflicts-basic.t
View File

@ -1,6 +1,5 @@
Turn on treestate Turn on treestate
$ setconfig format.dirstate=2
Path conflict checking is currently disabled by default because of issue5716. Path conflict checking is currently disabled by default because of issue5716.
Turn it on for this test. Turn it on for this test.

1
tests/test-phases-exchange.t
View File

@ -1,6 +1,5 @@
#require killdaemons #require killdaemons
$ setconfig format.dirstate=2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]

1
tests/test-rebase-collapse.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]

1
tests/test-rebuildstate.t
View File

@ -1,4 +1,3 @@
$ setconfig format.dirstate=2
$ cat > adddrop.py <<EOF $ cat > adddrop.py <<EOF
> from mercurial import registrar > from mercurial import registrar

6
tests/test-repo-compengines.t
View File

@ -8,7 +8,7 @@ A new repository uses zlib storage, which doesn't need a requirement
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
$ touch foo $ touch foo
$ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text to trigger compression' $ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text to trigger compression'
@ -48,7 +48,7 @@ A requirement specifying an unknown compression engine results in bail
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
$ touch foo $ touch foo
$ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text' $ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text'
@ -72,7 +72,7 @@ with that engine or a requirement
generaldelta generaldelta
revlogv1 revlogv1
store store
treedirstate treestate
$ hg debugrevlog -c | grep 0x78 $ hg debugrevlog -c | grep 0x78
0x78 (x) : 2 (100.00%) 0x78 (x) : 2 (100.00%)

2
tests/test-revlog-v2.t
View File

@ -23,7 +23,7 @@ Can create and open repo with revlog v2 requirement
exp-revlogv2.0 exp-revlogv2.0
fncache fncache
store store
treedirstate treestate
$ hg log $ hg log

1
tests/test-static-http.t
View File

@ -1,6 +1,5 @@
#require killdaemons #require killdaemons
$ setconfig format.dirstate=2
$ hg clone http://localhost:$HGPORT/ copy $ hg clone http://localhost:$HGPORT/ copy
abort: * (glob) abort: * (glob)
[255] [255]

5
tests/test-subrepo.t
View File

@ -1242,6 +1242,8 @@ Check that share works with subrepo
../shared/subrepo-1/.hg/hgrc ../shared/subrepo-1/.hg/hgrc
../shared/subrepo-1/.hg/requires ../shared/subrepo-1/.hg/requires
../shared/subrepo-1/.hg/sharedpath ../shared/subrepo-1/.hg/sharedpath
../shared/subrepo-1/.hg/treestate
../shared/subrepo-1/.hg/treestate/* (glob)
../shared/subrepo-2 ../shared/subrepo-2
../shared/subrepo-2/.hg ../shared/subrepo-2/.hg
../shared/subrepo-2/.hg/branch ../shared/subrepo-2/.hg/branch
@ -1252,10 +1254,11 @@ Check that share works with subrepo
../shared/subrepo-2/.hg/cache/storehash ../shared/subrepo-2/.hg/cache/storehash
../shared/subrepo-2/.hg/cache/storehash/* (glob) ../shared/subrepo-2/.hg/cache/storehash/* (glob)
../shared/subrepo-2/.hg/dirstate ../shared/subrepo-2/.hg/dirstate
../shared/subrepo-2/.hg/dirstate.tree* (glob)
../shared/subrepo-2/.hg/hgrc ../shared/subrepo-2/.hg/hgrc
../shared/subrepo-2/.hg/requires ../shared/subrepo-2/.hg/requires
../shared/subrepo-2/.hg/sharedpath ../shared/subrepo-2/.hg/sharedpath
../shared/subrepo-2/.hg/treestate
../shared/subrepo-2/.hg/treestate/* (glob)
../shared/subrepo-2/file ../shared/subrepo-2/file
$ hg -R ../shared in $ hg -R ../shared in
abort: repository default not found! abort: repository default not found!