##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

wireprotov2: define and implement "manifestdata" command...
wireprotov2: define and implement "manifestdata" command The added command can be used for obtaining manifest data. Given a manifest path and set of manifest nodes, data about manifests can be retrieved. Unlike changeset data, we wish to emit deltas to describe manifest revisions. So the command uses the relatively new API for building delta requests and emitting them. The code calls into deltaparent(), which I'm not very keen of. There's still work to be done in delta generation land so implementation details of storage (e.g. exactly one delta is stored/available) don't creep into higher levels. But we can worry about this later (there is already a TODO on imanifestorage tracking this). On the subject of parent deltas, the server assumes parent revisions exist on the receiving end. This is obviously wrong for shallow clone. I've added TODOs to add a mechanism to the command to allow clients to specify desired behavior. This shouldn't be too difficult to implement. Another big change is that the client must explicitly request manifest nodes to retrieve. This is a major departure from "getbundle," where the server derives relevant manifests as it iterates changesets and sends them automatically. As implemented, the client must transmit each requested node to the server. At 20 bytes per node, we're looking at 2 MB per 100,000 nodes. Plus wire encoding overhead. This isn't ideal for clients with limited upload bandwidth. I plan to address this in the future by allowing alternate mechanisms for defining the revisions to retrieve. One idea is to define a range of changeset revisions whose manifest revisions to retrieve (similar to how "changesetdata" works). We almost certainly want an API to look up an individual manifest by node. And that's where I've chosen to start with the implementation. Again, a theme of this early exchangev2 work is I want to start by building primitives for accessing raw repository data first and see how far we can get with those before we need more complexity. Differential Revision: https://phab.mercurial-scm.org/D4488
Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default
r39673:c7a7c7e8 default
Show More
test-push-checkheads-unpushed-D7.t
100 lines | 2.4 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-unpushed-D7.t
History | Source | Raw |Copy content |Copy permalink
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D7...
 r32018 ====================================
Testing head checking code: Case D-7
====================================
Mercurial checks for the introduction of new heads on push. Evolution comes
into play to detect if existing branches on the server are being replaced by
some of the new one we push.
This case is part of a series of tests checking this behavior.
Category D: remote head is "obs-affected" locally, but result is not part of the push
TestCase 7: single changesets, superseeded multiple time then pruned (on a new changeset unpushed) changeset
This is a partial push variation of B6
.. old-state:
..
.. * 1 changeset branch
..
.. new-state:
..
.. * old branch is rewritten onto another one,
.. * The rewriting it again rewritten on the root
.. * the new version is then pruned.
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. A'
.. A ø⇠ø⇠⊗ A''
.. | | |
.. C ◔ | ◔ | B
.. \|/ /
.. | /
.. |/
.. |
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir D7
$ cd D7
$ setuprepos
creating basic server and client repo
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd client
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B0
created new head
$ mkcommit A1
$ hg up '0'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit A2
created new head
$ hg up '0'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D7...
 r32018 $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D7...
 r32018 $ hg debugobsolete --record-parents `getid "desc(A2)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D7...
 r32018 $ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
| x c1f8d089020f (draft): A2
|/
| x ba93660aff8d (draft): A1
| |
| o 74ff5441d343 (draft): B0
|/
| x 8aaa48160adc (draft): A0
|/
o 1e4be0697311 (public): root
Actual testing
--------------
$ hg push --rev 'desc(C0)'
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pushing to $TESTTMP/D7/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D7...
 r32018 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
3 new obsolescence markers
marmoute
obsolete: reports the number of local changeset obsoleted when unbundling...
 r33249 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D7...
 r32018
$ cd ../..