comparison tests/test-treemanifest.t @ 31294:c134a33b1d73

treemanifest: make node reuse match flat manifest behavior In a flat manifest, a node with the same content but different parents is still considered a new node. In the current tree manifests however, if the content is the same, we ignore the parents entirely and just reuse the existing node. In our external treemanifest extension, we want to allow having one treemanifest for every flat manifests, as a way of easeing the migration to treemanifests. To make this possible, let's change the root node treemanifest behavior to match the behavior for flat manifests, so we can have a 1:1 relationship. While this sounds like a BC breakage, it's not actually a state users can normally get in because: A) you can't make empty commits, and B) even if you try to make an empty commit (by making a commit then amending it's changes away), the higher level commit logic in localrepo.commitctx() forces the commit to use the original p1 manifest node if no files were changed. So this would only affect extensions and automation that reached passed the normal localrepo.commit() logic straight into the manifest logic.
author Durham Goode <durham@fb.com>
date Wed, 01 Mar 2017 16:19:41 -0800
parents 1871a1ee64ed
children 2428e8ec0793
comparison
equal deleted inserted replaced
31293:2cdb1239ff8c 31294:c134a33b1d73
855 adding manifests 855 adding manifests
856 adding file changes 856 adding file changes
857 added 1 changesets with 1 changes to 1 files (+1 heads) 857 added 1 changesets with 1 changes to 1 files (+1 heads)
858 (run 'hg heads' to see heads, 'hg merge' to merge) 858 (run 'hg heads' to see heads, 'hg merge' to merge)
859 859
860 Committing a empty commit does not duplicate root treemanifest
861 $ echo z >> z
862 $ hg commit -Aqm 'pre-empty commit'
863 $ hg rm z
864 $ hg commit --amend -m 'empty commit'
865 saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-de37743b-amend-backup.hg (glob)
866 $ hg log -r 'tip + tip^' -T '{manifest}\n'
867 1:678d3574b88c
868 1:678d3574b88c
869 $ hg --config extensions.strip= strip -r . -q