##// 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
Jun Wu - - Load All Authors

File last commit:

r34505:8cef8f7d default
r39673:c7a7c7e8 default
Show More
test-rebase-transaction.t
196 lines | 3.4 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-transaction.t
History | Source | Raw |Copy content |Copy permalink
Martin von Zweigbergk
tests: simplify test-rebase-transaction.t...
 r36833 Rebasing using a single transaction
Jun Wu
test-rebase-base: clarify it is about the "--base" flag...
 r34505 $ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
> drawdag=$TESTDIR/drawdag.py
>
Martin von Zweigbergk
tests: simplify test-rebase-transaction.t...
 r36833 > [rebase]
> singletransaction=True
>
Jun Wu
test-rebase-base: clarify it is about the "--base" flag...
 r34505 > [phases]
> publish=False
>
> [alias]
> tglog = log -G --template "{rev}: {desc}"
> EOF
Martin von Zweigbergk
tests: simplify test-rebase-transaction.t...
 r36833 Check that a simple rebase works
Jun Wu
test-rebase-base: clarify it is about the "--base" flag...
 r34505
Martin von Zweigbergk
tests: simplify test-rebase-transaction.t...
 r36833 $ hg init simple && cd simple
Jun Wu
test-rebase-base: clarify it is about the "--base" flag...
 r34505 $ hg debugdrawdag <<'EOF'
> Z
> |
> | D
> | |
> | C
> | |
> Y B
> |/
> A
> EOF
Martin von Zweigbergk
rebase: also include commit of collapsed commits in single transaction...
 r36945 - We should only see one status stored message. It comes from the start.
Jun Wu
test-rebase-base: clarify it is about the "--base" flag...
 r34505 $ hg rebase --debug -b D -d Z | grep 'status stored'
rebase status stored
$ hg tglog
o 5: D
|
o 4: C
|
o 3: B
|
o 2: Z
|
o 1: Y
|
o 0: A
$ cd ..
Martin von Zweigbergk
tests: add a few tests involving --collapse and rebase.singletransaction=1...
 r36834
Check that --collapse works
$ hg init collapse && cd collapse
$ hg debugdrawdag <<'EOF'
> Z
> |
> | D
> | |
> | C
> | |
> Y B
> |/
> A
> EOF
- We should only see two status stored messages. One from the start, one from
Martin von Zweigbergk
rebase: also include commit of collapsed commits in single transaction...
 r36945 - cmdutil.commitforceeditor() which forces tr.writepending()
Martin von Zweigbergk
tests: add a few tests involving --collapse and rebase.singletransaction=1...
 r36834 $ hg rebase --collapse --debug -b D -d Z | grep 'status stored'
rebase status stored
rebase status stored
$ hg tglog
o 3: Collapsed revision
| * B
| * C
| * D
o 2: Z
|
o 1: Y
|
o 0: A
$ cd ..
With --collapse, check that conflicts can be resolved and rebase can then be
continued
$ hg init collapse-conflict && cd collapse-conflict
$ hg debugdrawdag <<'EOF'
> Z # Z/conflict=Z
> |
> | D
> | |
> | C # C/conflict=C
> | |
> Y B
> |/
> A
> EOF
$ hg rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B)
rebasing 3:c26739dbe603 "C" (C)
merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg tglog
o 5: D
|
| @ 4: Z
| |
@ | 3: C
| |
| o 2: Y
| |
o | 1: B
|/
o 0: A
$ hg st
M C
M conflict
A B
? conflict.orig
$ echo resolved > conflict
$ hg resolve -m
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
already rebased 1:112478962961 "B" (B) as 79bc8f4973ce
rebasing 3:c26739dbe603 "C" (C)
rebasing 5:d24bb333861c "D" (D tip)
saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg
$ hg tglog
o 3: Collapsed revision
| * B
| * C
| * D
o 2: Z
|
o 1: Y
|
o 0: A
$ cd ..
With --collapse, check that the commit message editing can be canceled and
rebase can then be continued
$ hg init collapse-cancel-editor && cd collapse-cancel-editor
$ hg debugdrawdag <<'EOF'
> Z
> |
> | D
> | |
> | C
> | |
> Y B
> |/
> A
> EOF
$ HGEDITOR=false hg --config ui.interactive=1 rebase --collapse -b D -d Z
rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C)
rebasing 5:f585351a92f8 "D" (D tip)
Martin von Zweigbergk
rebase: also include commit of collapsed commits in single transaction...
 r36945 transaction abort!
rollback completed
Martin von Zweigbergk
tests: add a few tests involving --collapse and rebase.singletransaction=1...
 r36834 abort: edit failed: false exited with status 1
[255]
$ hg tglog
o 5: D
|
Martin von Zweigbergk
rebase: also include commit of collapsed commits in single transaction...
 r36945 | o 4: Z
Martin von Zweigbergk
tests: add a few tests involving --collapse and rebase.singletransaction=1...
 r36834 | |
o | 3: C
| |
| o 2: Y
| |
o | 1: B
|/
o 0: A
$ hg rebase --continue
Martin von Zweigbergk
rebase: also include commit of collapsed commits in single transaction...
 r36945 rebasing 1:112478962961 "B" (B)
rebasing 3:26805aba1e60 "C" (C)
rebasing 5:f585351a92f8 "D" (D tip)
Martin von Zweigbergk
tests: add a few tests involving --collapse and rebase.singletransaction=1...
 r36834 saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
$ hg tglog
o 3: Collapsed revision
| * B
| * C
| * D
o 2: Z
|
o 1: Y
|
o 0: A
$ cd ..