Set up repo

  $ hg --config experimental.treemanifest=True init repo

  $ cd repo

Requirements get set on init

  $ hg debugrequires | grep treemanifest

  treemanifest

Without directories, looks like any other repo

  $ echo 0 > a

  $ echo 0 > b

  $ hg ci -Aqm initial

  $ hg debugdata -m 0

  a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)

  b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)

Submanifest is stored in separate revlog

  $ mkdir dir1

  $ echo 1 > dir1/a

  $ echo 1 > dir1/b

  $ echo 1 > e

  $ hg ci -Aqm 'add dir1'

  $ hg debugdata -m 1

  a\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)

  b\x00362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (esc)

  dir1\x008b3ffd73f901e83304c83d33132c8e774ceac44et (esc)

  e\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)

  $ hg debugdata --dir dir1 0

  a\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)

  b\x00b8e02f6433738021a065f94175c7cd23db5f05be (esc)

Can add nested directories

  $ mkdir dir1/dir1

  $ echo 2 > dir1/dir1/a

  $ echo 2 > dir1/dir1/b

  $ mkdir dir1/dir2

  $ echo 2 > dir1/dir2/a

  $ echo 2 > dir1/dir2/b

  $ hg ci -Aqm 'add dir1/dir1'

  $ hg files -r .

  a

  b

  dir1/a

  dir1/b

  dir1/dir1/a

  dir1/dir1/b

  dir1/dir2/a

  dir1/dir2/b

  e

The manifest command works

  $ hg manifest

  a

  b

  dir1/a

  dir1/b

  dir1/dir1/a

  dir1/dir1/b

  dir1/dir2/a

  dir1/dir2/b

  e

Revision is not created for unchanged directory

  $ mkdir dir2

  $ echo 3 > dir2/a

  $ hg add dir2

  adding dir2/a

  $ hg debugindex --dir dir1 > before

  $ hg ci -qm 'add dir2'

  $ hg debugindex --dir dir1 > after

  $ diff before after

  $ rm before after

Removing directory does not create an revlog entry

  $ hg rm dir1/dir1

  removing dir1/dir1/a

  removing dir1/dir1/b

  $ hg debugindex --dir dir1/dir1 > before

  $ hg ci -qm 'remove dir1/dir1'

  $ hg debugindex --dir dir1/dir1 > after

  $ diff before after

  $ rm before after

Check that hg files (calls treemanifest.walk()) works

without loading all directory revlogs

  $ hg co 'desc("add dir2")'

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ mv .hg/store/meta/dir2 .hg/store/meta/dir2-backup

  $ hg files -r . dir1

  dir1/a

  dir1/b

  dir1/dir1/a

  dir1/dir1/b

  dir1/dir2/a

  dir1/dir2/b

Check that status between revisions works (calls treemanifest.matches())

without loading all directory revlogs

  $ hg status --rev 'desc("add dir1")' --rev . dir1

  A dir1/dir1/a

  A dir1/dir1/b

  A dir1/dir2/a

  A dir1/dir2/b

  $ mv .hg/store/meta/dir2-backup .hg/store/meta/dir2

Merge creates 2-parent revision of directory revlog

  $ echo 5 > dir1/a

  $ hg ci -Aqm 'modify dir1/a'

  $ hg co '.^'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo 6 > dir1/b

  $ hg ci -Aqm 'modify dir1/b'

  $ hg merge 'desc("modify dir1/a")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'conflict-free merge involving dir1/'

  $ cat dir1/a

  5

  $ cat dir1/b

  6

  $ hg debugindex --dir dir1

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

       0       1 8b3ffd73f901 000000000000 000000000000

       1       2 68e9d057c5a8 8b3ffd73f901 000000000000

       2       4 4698198d2624 68e9d057c5a8 000000000000

       3       5 44844058ccce 68e9d057c5a8 000000000000

       4       6 bf3d9b744927 68e9d057c5a8 000000000000

       5       7 dde7c0af2a03 bf3d9b744927 44844058ccce

Merge keeping directory from parent 1 does not create revlog entry. (Note that

dir1's manifest does change, but only because dir1/a's filelog changes.)

  $ hg co 'desc("add dir2")'

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo 8 > dir2/a

  $ hg ci -m 'modify dir2/a'

  created new head

  $ hg debugindex --dir dir2 > before

  $ hg merge 'desc("modify dir1/a")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg revert -r 'desc("modify dir2/a")' .

  reverting dir1/a

  $ hg ci -m 'merge, keeping parent 1'

  $ hg debugindex --dir dir2 > after

  $ diff before after

  $ rm before after

Merge keeping directory from parent 2 does not create revlog entry. (Note that

dir2's manifest does change, but only because dir2/a's filelog changes.)

  $ hg co 'desc("modify dir2/a")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg debugindex --dir dir1 > before

  $ hg merge 'desc("modify dir1/a")'

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg revert -r 'desc("modify dir1/a")' .

  reverting dir2/a

  $ hg ci -m 'merge, keeping parent 2'

  created new head

  $ hg debugindex --dir dir1 > after

  $ diff before after

  $ rm before after

Create flat source repo for tests with mixed flat/tree manifests

  $ cd ..

  $ hg init repo-flat

  $ cd repo-flat

Create a few commits with flat manifest

  $ echo 0 > a

  $ echo 0 > b

  $ echo 0 > e

  $ for d in dir1 dir1/dir1 dir1/dir2 dir2

  > do

  >   mkdir $d

  >   echo 0 > $d/a

  >   echo 0 > $d/b

  > done

  $ hg ci -Aqm initial

  $ echo 1 > a

  $ echo 1 > dir1/a

  $ echo 1 > dir1/dir1/a

  $ hg ci -Aqm 'modify on branch 1'

  $ hg co 0

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo 2 > b

  $ echo 2 > dir1/b

  $ echo 2 > dir1/dir1/b

  $ hg ci -Aqm 'modify on branch 2'

  $ hg merge 1

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'merge of flat manifests to new flat manifest'

  $ cd ..

  $ hg -R repo-flat serve -p $HGPORT -d \

  >   --pid-file=port-0-hg.pid \

  >   --errorlog=port-0-errors.log

  $ cat port-0-hg.pid >> $DAEMON_PIDS

Create clone with tree manifests enabled

  $ hg clone --config experimental.treemanifest=1 \

  >   http://localhost:$HGPORT repo-mixed -r 1

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 14 changes to 11 files

  new changesets 5b02a3e8db7e:581ef6037d8b

  updating to branch default

  11 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cat port-0-errors.log

  $ cd repo-mixed

  $ test -d .hg/store/meta

  [1]

  $ hg debugrequires | grep treemanifest

  treemanifest

Should be possible to push updates from flat to tree manifest repo

  $ hg -R ../repo-flat push ssh://user@dummy/repo-mixed

  pushing to ssh://user@dummy/repo-mixed

  searching for changes

  remote: adding changesets

  remote: adding manifests

  remote: adding file changes

  remote: added 2 changesets with 3 changes to 3 files

Commit should store revlog per directory

  $ hg co 1

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo 3 > a

  $ echo 3 > dir1/a

  $ echo 3 > dir1/dir1/a

  $ hg ci -m 'first tree'

  created new head

  $ find .hg/store/meta | sort

  .hg/store/meta

  .hg/store/meta/dir1

  .hg/store/meta/dir1/00manifest.i

  .hg/store/meta/dir1/dir1

  .hg/store/meta/dir1/dir1/00manifest.i

  .hg/store/meta/dir1/dir2

  .hg/store/meta/dir1/dir2/00manifest.i

  .hg/store/meta/dir2

  .hg/store/meta/dir2/00manifest.i

Merge of two trees

  $ hg co 2

  6 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 1

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m 'merge of flat manifests to new tree manifest'

  created new head

  $ hg diff -r 3

Parent of tree root manifest should be flat manifest, and two for merge

  $ hg debugindex -m

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

       0       0 40536115ed9e 000000000000 000000000000

       1       1 f3376063c255 40536115ed9e 000000000000

       2       2 5d9b9da231a2 40536115ed9e 000000000000

       3       3 d17d663cbd8a 5d9b9da231a2 f3376063c255

       4       4 51e32a8c60ee f3376063c255 000000000000

       5       5 cc5baa78b230 5d9b9da231a2 f3376063c255

Status across flat/tree boundary should work

  $ hg status --rev '.^' --rev .

  M a

  M dir1/a

  M dir1/dir1/a

Turning off treemanifest config has no effect

  $ hg debugindex --dir dir1

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

       0       4 064927a0648a 000000000000 000000000000

       1       5 25ecb8cb8618 000000000000 000000000000

  $ echo 2 > dir1/a

  $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'

  $ hg debugindex --dir dir1

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

       0       4 064927a0648a 000000000000 000000000000

       1       5 25ecb8cb8618 000000000000 000000000000

       2       6 5b16163a30c6 25ecb8cb8618 000000000000

Stripping and recovering changes should work

  $ hg st --change tip

  M dir1/a

  $ hg --config extensions.strip= strip tip

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg

  $ hg debugindex --dir dir1

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

       0       4 064927a0648a 000000000000 000000000000

       1       5 25ecb8cb8618 000000000000 000000000000

#if repobundlerepo

  $ hg incoming .hg/strip-backup/*

  comparing with .hg/strip-backup/*-backup.hg (glob)

  searching for changes

  changeset:   6:51cfd7b1e13b

  tag:         tip

  user:        test

  date:        Thu Jan 01 00:00:00 1970 +0000

  summary:     modify dir1/a

#endif

  $ hg unbundle .hg/strip-backup/*

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

  new changesets 51cfd7b1e13b (1 drafts)

  (run 'hg update' to get a working copy)

  $ hg --config extensions.strip= strip tip

  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)

  $ hg unbundle -q .hg/strip-backup/*

  $ hg debugindex --dir dir1

     rev linkrev       nodeid    p1-nodeid    p2-nodeid

       0       4 064927a0648a 000000000000 000000000000

       1       5 25ecb8cb8618 000000000000 000000000000

       2       6 5b16163a30c6 25ecb8cb8618 000000000000

  $ hg st --change tip

  M dir1/a

Shelving and unshelving should work

  $ echo foo >> dir1/a

  $ hg shelve

  shelved as default

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg unshelve

  unshelving change 'default'

  $ hg diff --nodates

  diff -r 708a273da119 dir1/a

  --- a/dir1/a

  +++ b/dir1/a

  @@ -1,1 +1,2 @@

   1

  +foo

Pushing from treemanifest repo to an empty repo makes that a treemanifest repo

  $ cd ..

  $ hg init empty-repo

  $ cat << EOF >> empty-repo/.hg/hgrc

  > [experimental]

  > changegroup3=yes

  > EOF

  $ hg debugrequires -R empty-repo | grep treemanifest

  [1]

  $ hg push -R repo -r 0 empty-repo

  pushing to empty-repo

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 2 changes to 2 files

  $ hg debugrequires -R empty-repo | grep treemanifest

  treemanifest

Pushing to an empty repo works

  $ hg --config experimental.treemanifest=1 init clone

  $ hg debugrequires -R clone | grep treemanifest

  treemanifest

  $ hg push -R repo clone

  pushing to clone

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 11 changesets with 15 changes to 10 files (+3 heads)

  $ hg debugrequires -R clone | grep treemanifest

  treemanifest

  $ hg -R clone verify -q

Create deeper repo with tree manifests.

  $ hg --config experimental.treemanifest=True init deeprepo

  $ cd deeprepo

  $ mkdir .A

  $ mkdir b