##// 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
Meirambek Omyrzak - - Load All Authors

File last commit:

r39525:f1186c29 default
r39673:c7a7c7e8 default
Show More
test-excessive-merge.t
101 lines | 2.7 KiB | text/troff | Tads3Lexer
/ tests / test-excessive-merge.t
History | Source | Raw |Copy content |Copy permalink
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 $ hg init
$ echo foo > a
$ echo foo > b
$ hg add a b
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "test"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ echo blah > a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "branch a"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ hg co 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo blah > b
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "branch b"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 created new head
$ HGMERGE=true hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "merge b/a -> blah"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ hg co 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ HGMERGE=true hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "merge a/b -> blah"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 created new head
$ hg log
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 4:2ee31f665a86
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
 r12156 parent: 1:96155394af80
parent: 2:92cc4c306b19
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: merge a/b -> blah
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 3:e16a66a37edd
parent: 2:92cc4c306b19
parent: 1:96155394af80
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: merge b/a -> blah
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 2:92cc4c306b19
parent: 0:5e0375449e74
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: branch b
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 1:96155394af80
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: branch a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 0:5e0375449e74
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: test
Sune Foldager
debugindex etc.: add --changelog and --manifest options...
 r14323 $ hg debugindex --changelog
Gregory Szorc
debugcommands: drop offset and length from debugindex by default...
 r37301 rev linkrev nodeid p1 p2
0 0 5e0375449e74 000000000000 000000000000
1 1 96155394af80 5e0375449e74 000000000000
2 2 92cc4c306b19 5e0375449e74 000000000000
3 3 e16a66a37edd 92cc4c306b19 96155394af80
4 4 2ee31f665a86 96155394af80 92cc4c306b19
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
revision 1
$ hg manifest --debug 1
79d7492df40aa0fa093ec4209be78043c181f094 644 a
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
revision 2
$ hg manifest --debug 2
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
revision 3
$ hg manifest --debug 3
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
revision 4
$ hg manifest --debug 4
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 $ hg debugindex a
Gregory Szorc
debugcommands: drop offset and length from debugindex by default...
 r37301 rev linkrev nodeid p1 p2
0 0 2ed2a3912a0b 000000000000 000000000000
1 1 79d7492df40a 2ed2a3912a0b 000000000000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
 r39525 checked 5 changesets with 4 changes to 2 files