Mercurial > hg
view tests/test-children.t @ 24787:9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Before, a --clean update with largefiles would use the "optimization" that it
didn't read hashes from standin files before and after the update. Instead of
trusting the content of the standin files, it would rehash all the actual
largefiles that lfdirstate reported clean and update the standins that didn't
have the expected content. It could thus in some "impossible" situations
automatically recover from some "largefile got out sync with its standin"
issues (even there apparently still were weird corner cases where it could
fail). This extra checking is similar to what core --clean intentionally do
not do, and it made update --clean unbearable slow.
Usually in core Mercurial, --clean will rely on the dirstate to find the files
it should update. (It is thus intentionally possible (when trying to trick the
system or if there should be bugs) to end up in situations where --clean not
will restore the working directory content correctly.) Checking every file when
we "know" it is ok is however not an option - that would be too slow.
Instead, trust the content of the standin files. Use the same logic for --clean
as for linear updates and trust the dirstate and that our "logic" will keep
them in sync. It is much cheaper to just rehash the largefiles reported dirty
by a status walk and read all standins than to hash largefiles.
Most of the changes are just a change of indentation now when the different
kinds of updates no longer are handled that differently. Standins for added
files are however only written when doing a normal update, while deleted and
removed files only will be updated for --clean updates.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 15 Apr 2015 15:22:16 -0400 |
parents | 3eb9045396b0 |
children | 7c8524efd847 |
line wrap: on
line source
test children command $ cat <<EOF >> $HGRCPATH > [extensions] > children = > EOF init $ hg init t $ cd t no working directory $ hg children setup $ echo 0 > file0 $ hg ci -qAm 0 -d '0 0' $ echo 1 > file1 $ hg ci -qAm 1 -d '1 0' $ echo 2 >> file0 $ hg ci -qAm 2 -d '2 0' $ hg co null 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo 3 > file3 $ hg ci -qAm 3 -d '3 0' hg children at revision 3 (tip) $ hg children $ hg co null 0 files updated, 0 files merged, 1 files removed, 0 files unresolved hg children at nullrev (should be 0 and 3) $ hg children changeset: 0:4df8521a7374 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 0 changeset: 3:e2962852269d tag: tip parent: -1:000000000000 user: test date: Thu Jan 01 00:00:03 1970 +0000 summary: 3 $ hg co 1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved hg children at revision 1 (should be 2) $ hg children changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 $ hg co 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved hg children at revision 2 (other head) $ hg children $ for i in null 0 1 2 3; do > echo "hg children -r $i" > hg children -r $i > done hg children -r null changeset: 0:4df8521a7374 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 0 changeset: 3:e2962852269d tag: tip parent: -1:000000000000 user: test date: Thu Jan 01 00:00:03 1970 +0000 summary: 3 hg children -r 0 changeset: 1:708c093edef0 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: 1 hg children -r 1 changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 hg children -r 2 hg children -r 3 hg children -r 0 file0 (should be 2) $ hg children -r 0 file0 changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 hg children -r 1 file0 (should be 2) $ hg children -r 1 file0 changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 $ hg co 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved hg children file0 at revision 0 (should be 2) $ hg children file0 changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 should be compatible with templater (don't pass fctx to displayer) $ hg children file0 -Tdefault changeset: 2:8f5eea5023c2 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: 2 $ cd ..