##// 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
Yuya Nishihara - - Load All Authors

File last commit:

r39662:6ecfd12f default
r39673:c7a7c7e8 default
Show More
test-merge-default.t
175 lines | 4.0 KiB | text/troff | Tads3Lexer
/ tests / test-merge-default.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-merge-default
 r12255 $ hg init
$ echo a > a
$ hg commit -A -ma
adding a
$ echo b >> a
$ hg commit -mb
$ echo c >> a
$ hg commit -mc
$ hg up 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo d >> a
$ hg commit -md
created new head
$ hg up 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo e >> a
$ hg commit -me
created new head
$ hg up 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Should fail because not at a head:
$ hg merge
Pierre-Yves David
merge: give priority to "not at head" failures for bare 'hg merge'...
 r28103 abort: working directory not at a head revision
(use 'hg update' or merge with an explicit revision)
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-merge-default
 r12255
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pulkit Goyal
update: show the commit to which we updated in case of multiple heads (BC)...
 r32698 updated to "f25cbe84d8b3: e"
Pierre-Yves David
update: warn about other topological heads on bare update...
 r28029 2 other heads for branch "default"
Adrian Buehlmann
tests: unify test-merge-default
 r12255
Should fail because > 2 heads:
$ HGMERGE=internal:other; export HGMERGE
$ hg merge
abort: branch 'default' has 3 heads - please merge with an explicit rev
(run 'hg heads .' to see heads)
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-merge-default
 r12255
Should succeed:
$ hg merge 2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Matt Harbison
identify: add template support...
 r33051 $ hg id -Tjson
[
{
"bookmarks": [],
"branch": "default",
Matt Harbison
identify: rename 'changed' keyword -> 'dirty'...
 r33054 "dirty": "+",
Yuya Nishihara
identify: use fm.hexfunc thoroughly...
 r39661 "id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+",
Matt Harbison
identify: add template support...
 r33051 "node": "ffffffffffffffffffffffffffffffffffffffff",
Yuya Nishihara
identify: change {parents} to a list of nodes (BC)...
 r39662 "parents": ["f25cbe84d8b320e298e7703f18a25a3959518c23", "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab"],
Matt Harbison
identify: add template support...
 r33051 "tags": ["tip"]
}
]
Adrian Buehlmann
tests: unify test-merge-default
 r12255 $ hg commit -mm1
Should succeed - 2 heads:
$ hg merge -P
changeset: 3:ea9ff125ff88
parent: 1:1846eede8b68
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: d
$ hg merge
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -mm2
Matt Harbison
identify: add template support...
 r33051 $ hg id -r 1 -Tjson
[
{
"bookmarks": [],
"branch": "default",
Yuya Nishihara
identify: use fm.hexfunc thoroughly...
 r39661 "id": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
Matt Harbison
identify: add template support...
 r33051 "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
"tags": []
}
]
Adrian Buehlmann
tests: unify test-merge-default
 r12255 Should fail because at tip:
$ hg merge
Kevin Bullock
merge: make 'nothing to merge' aborts consistent...
 r15619 abort: nothing to merge
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-merge-default
 r12255
$ hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Should fail because there is only one head:
$ hg merge
Kevin Bullock
merge: make 'nothing to merge' aborts consistent...
 r15619 abort: nothing to merge
(use 'hg update' instead)
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-merge-default
 r12255
$ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo f >> a
$ hg branch foobranch
marked working directory as branch foobranch
Matt Mackall
branch: warn on branching
 r15615 (branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann
tests: unify test-merge-default
 r12255 $ hg commit -mf
Should fail because merge with other branch:
$ hg merge
abort: branch 'foobranch' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-merge-default
 r12255
Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
Mads Kiilerich
comments: describe ancestor consistently - avoid 'least common ancestor'...
 r22389 are not ancestors of 7, regardless of where their common ancestors are.
Adrian Buehlmann
tests: unify test-merge-default
 r12255
Merge preview not affected by common ancestor:
$ hg up -q 7
$ hg merge -q -P 6
2:2d95304fed5d
4:f25cbe84d8b3
5:a431fabd6039
6:e88e33f3bf62
Pierre-Yves David
revset: rename and test '_destmerge'...
 r26716 Test experimental destination revset
$ hg log -r '_destmerge()'
abort: branch 'foobranch' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
[255]
Pierre-Yves David
destutil: allow to specify an explicit source for the merge...
 r28139 (on a branch with a two heads)
$ hg up 5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo f >> a
$ hg commit -mf
created new head
$ hg log -r '_destmerge()'
changeset: 6:e88e33f3bf62
parent: 5:a431fabd6039
parent: 3:ea9ff125ff88
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: m2
(from the other head)
$ hg log -r '_destmerge(e88e33f3bf62)'
changeset: 8:b613918999e2
tag: tip
parent: 5:a431fabd6039
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: f
(from unrelated branch)
$ hg log -r '_destmerge(foobranch)'
abort: branch 'foobranch' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
[255]