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

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

wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472
Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default
r39595:07b58266 default
Show More
test-push-checkheads-partial-C4.t
85 lines | 1.9 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-partial-C4.t
History | Source | Raw |Copy content |Copy permalink
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C4...
 r31985 ====================================
Testing head checking code: Case C-4
====================================
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 C: case were the branch is only partially obsoleted
TestCase 4: 2 changeset branch, only the base is pruned
.. old-state:
..
.. * 2 changeset branch
..
.. new-state:
..
.. * old base is pruned
.. * 1 new unrelated branch
..
.. expected-result:
..
.. * push denied
..
.. graph-summary:
..
.. B ◔
.. |
.. A ⊗ ◔ C
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir C4
$ cd C4
$ setuprepos
creating basic server and client repo
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd server
$ mkcommit B0
$ cd ../client
$ hg pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/C4/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C4...
 r31985 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
 r39516 new changesets d73caddc5533 (1 drafts)
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C4...
 r31985 (run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Martin von Zweigbergk
evolution: report new unstable changesets...
 r35727 1 new orphan changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C4...
 r31985 $ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
av6
graphlog: add another graph node type, unstable, using character "*" (BC)
 r35524 | * d73caddc5533 (draft): B0
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C4...
 r31985 | |
| 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/C4/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C4...
 r31985 searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ cd ../..