Mercurial > hg
view tests/test-drawdag.t @ 40393:229d23cdb203
exchangev2: support fetching shallow files history
This commit teaches the exchangev2 client code to handle fetching shallow
files data.
Only shallow fetching of files data is supported: shallow fetching of
changeset and manifest data is explicitly not yet supported.
Previously, we would fetch file revisions for changesets that were received
by the current pull operation. In the new model, we calculate the set of
"relevant" changesets given the pull depth and only fetch files data for
those changesets.
We also teach the "filesdata" command invocation to vary parameters as needed.
The implementation here is far from complete or optimal. Subsequent pulls will
end up re-fetching a lot of files data. But the application of this data should
mostly be a no-op on the client, so it isn't a big deal.
Depending on the order file revisions are fetched in, revisions could get
inserted with the wrong revision number relationships. I think the best way
to deal with this is to remove revision numbers from storage and to either
dynamically derive them (by reconstructing a DAG from nodes/parents) or remove
revision numbers from the file storage interface completely.
A missing API that we'll likely want to write pretty soon is "ensure files
for revision(s) are present." We can kind of cajole exchangev2.pull() to do
this. But it isn't very efficient. For example, in simple cases like
widening the store to obtain data for a single revision, it is probably
more efficient to walk the manifest and find exactly which file revisions
are missing and to make explicit requests for just their data. In more
advanced cases, asking the server for all files data may be more efficient,
even though it requires sending data the client already has. There is tons
of room for future experimentation here. And TBH I'm not sure what the
final state will be.
Anyway, this commit gets us pretty close to being able to have shallow
and narrow checkouts with exchangev2/sqlite storage. Close enough that a
minimal extension should be able to provide fill in the gaps until the code
in core stabilizes and there is a user-facing way to trigger the
narrow/shallow bits from `hg clone` without also implying using of the
narrow extension...
Differential Revision: https://phab.mercurial-scm.org/D5169
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 19 Oct 2018 12:30:49 +0200 |
parents | 1a09dad8b85a |
children |
line wrap: on
line source
$ cat >> $HGRCPATH<<EOF > [extensions] > drawdag=$TESTDIR/drawdag.py > [experimental] > evolution=true > EOF $ reinit () { > rm -rf .hg && hg init > } $ hg init Test what said in drawdag.py docstring $ hg debugdrawdag <<'EOS' > c d > |/ > b > | > a > EOS $ hg log -G -T '{rev} {desc} ({tags})' o 3 d (d tip) | | o 2 c (c) |/ o 1 b (b) | o 0 a (a) $ hg debugdrawdag <<'EOS' > foo bar bar foo > | / | | > ancestor(c,d) a baz > EOS $ hg log -G -T '{desc}' o foo |\ +---o bar | | | | o | baz | / +---o d | | +---o c | | o | b |/ o a $ reinit $ hg debugdrawdag <<'EOS' > o foo > |\ > +---o bar > | | | > | o | baz > | / > +---o d > | | > +---o c > | | > o | b > |/ > o a > EOS $ hg log -G -T '{desc}' o foo |\ | | o d | |/ | | o c | |/ | | o bar | |/| | o | b | |/ o / baz / o a $ reinit $ hg debugdrawdag <<'EOS' > o foo > |\ > | | o d > | |/ > | | o c > | |/ > | | o bar > | |/| > | o | b > | |/ > o / baz > / > o a > EOS $ hg log -G -T '{desc}' o foo |\ | | o d | |/ | | o c | |/ | | o bar | |/| | o | b | |/ o / baz / o a $ hg manifest -r a a $ hg manifest -r b a b $ hg manifest -r bar a b $ hg manifest -r foo a b baz Edges existed in repo are no-ops $ reinit $ hg debugdrawdag <<'EOS' > B C C > | | | > A A B > EOS $ hg log -G -T '{desc}' o C |\ | o B |/ o A $ hg debugdrawdag <<'EOS' > C D C > | | | > B B A > EOS $ hg log -G -T '{desc}' o D | | o C |/| o | B |/ o A Node with more than 2 parents are disallowed $ hg debugdrawdag <<'EOS' > A > /|\ > D B C > EOS abort: A: too many parents: C D B [255] Cycles are disallowed $ hg debugdrawdag <<'EOS' > A > | > A > EOS abort: the graph has cycles [255] $ hg debugdrawdag <<'EOS' > A > | > B > | > A > EOS abort: the graph has cycles [255] Create obsmarkers via comments $ reinit $ hg debugdrawdag <<'EOS' > G > | > I D C F # split: B -> E, F, G > \ \| | # replace: C -> D -> H > H B E # prune: F, I > \|/ > A > EOS 1 new orphan changesets $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}' * G 711f53bbef0bebd12eb6f0511d5e2e998b984846 | x F 64a8289d249234b9886244d379f15e6b650b28e3 | o E 7fb047a69f220c21711122dfd94305a9efb60cba | | x D be0ef73c17ade3fc89dc41701eb9fc3a91b58282 | | | | x C 26805aba1e600a82e93661149f2313866a221a7b | |/ | x B 112478962961147124edd43549aedd1a335e44bf |/ | x I 58e6b987bf7045fcd9c54f496396ca1d1fc81047 | | | o H 575c4b5ec114d64b681d33f8792853568bfb2b2c |/ o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0 $ hg debugobsolete 112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'split', 'user': 'test'} 26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'replace', 'user': 'test'} be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'replace', 'user': 'test'} 64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} 58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} Change file contents via comments $ reinit $ hg debugdrawdag <<'EOS' > C # A/dir1/a = 1\n2 > |\ # B/dir2/b = 34 > A B # C/dir1/c = 5 > # C/dir2/c = 6 > # C/A = a > # C/B = b > EOS $ hg log -G -T '{desc} {files}' o C A B dir1/c dir2/c |\ | o B B dir2/b | o A A dir1/a $ for f in `hg files -r C`; do > echo FILE "$f" > hg cat -r C "$f" > echo > done FILE A a FILE B b FILE dir1/a 1 2 FILE dir1/c 5 FILE dir2/b 34 FILE dir2/c 6