This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4978

wireprotov2: stop sending phase updates for base revisions
ClosedPublic

Authored by indygreg on Oct 12 2018, 4:14 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6c42409691ec: wireprotov2: stop sending phase updates for base revisions
Summary

This feature is broken and doesn't work properly in all scenarios.
e.g. if we have the following DAGs:

client server

D draft

C draft C draft
B draft B public
A public A public

The current code would only send the phase data for C. The
client wouldn't see that B moved from draft to public.

This feature will be restored in a future commit. For now, it is
making refactoring of how revisions are specified in the wire protocol
a bit difficult...

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 11885

mercurial/wireprotov2server.py

yield { yield {
b'totalitems': len(outgoing), b'totalitems': len(outgoing),
} }
# The phases of nodes already transferred to the client may have changed # The phases of nodes already transferred to the client may have changed
# since the client last requested data. We send phase-only records # since the client last requested data. We send phase-only records
# for these revisions, if requested. # for these revisions, if requested.
if b'phase' in fields and noderange is not None: # TODO actually do this. We'll probably want to emit phase heads
# TODO skip nodes whose phase will be reflected by a node in the # in the ancestry set of the outgoing revisions. This will ensure
# outgoing set. This is purely an optimization to reduce data # that phase updates within that set are seen.
# size. if b'phase' in fields:
for node in noderange[0]: pass
yield {
b'node': node,
b'phase': b'public' if publishing else repo[node].phasestr()
}
nodebookmarks = {} nodebookmarks = {}
for mark, node in repo._bookmarks.items(): for mark, node in repo._bookmarks.items():
nodebookmarks.setdefault(node, set()).add(mark) nodebookmarks.setdefault(node, set()).add(mark)
# It is already topologically sorted by revision number. # It is already topologically sorted by revision number.
for node in outgoing: for node in outgoing:
d = { d = {

tests/test-wireproto-command-changesetdata.t

b'3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', b'3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
] ]
}, },
b'1b74476799ec8318045db759b1b4bcc9b839d0aa\ntest\n0 0\na\n\ncommit 3' b'1b74476799ec8318045db759b1b4bcc9b839d0aa\ntest\n0 0\na\n\ncommit 3'
] ]
Base nodes have just their metadata (e.g. phase) transferred Base nodes have just their metadata (e.g. phase) transferred
TODO this doesn't work
$ sendhttpv2peer << EOF $ sendhttpv2peer << EOF
> command changesetdata > command changesetdata
> fields eval:[b'phase', b'parents', b'revision'] > fields eval:[b'phase', b'parents', b'revision']
> noderange eval:[[b'\x33\x90\xef\x85\x00\x73\xfb\xc2\xf0\xdf\xff\x22\x44\x34\x2c\x8e\x92\x29\x01\x3a'], [b'\x0b\xb8\xad\x89\x4a\x15\xb1\x53\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f\x2a\x4b\x28\xdd', b'\xea\xe5\xf8\x2c\x2e\x62\x23\x68\xd2\x7d\xae\xcb\x76\xb7\xe3\x93\xd0\xf2\x42\x11']] > noderange eval:[[b'\x33\x90\xef\x85\x00\x73\xfb\xc2\xf0\xdf\xff\x22\x44\x34\x2c\x8e\x92\x29\x01\x3a'], [b'\x0b\xb8\xad\x89\x4a\x15\xb1\x53\x80\xb2\xa2\xa5\xb1\x83\xe2\x0f\x2a\x4b\x28\xdd', b'\xea\xe5\xf8\x2c\x2e\x62\x23\x68\xd2\x7d\xae\xcb\x76\xb7\xe3\x93\xd0\xf2\x42\x11']]
> EOF > EOF
creating http peer for wire protocol version 2 creating http peer for wire protocol version 2
sending changesetdata command sending changesetdata command
response: gen[ response: gen[
{ {
b'totalitems': 3 b'totalitems': 3
}, },
{ {
b'node': b'3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:',
b'phase': b'public'
},
{
b'fieldsfollowing': [ b'fieldsfollowing': [
[ [
b'revision', b'revision',
63 63
] ]
], ],
b'node': b'u\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1', b'node': b'u\x92\x91~\x1c>\x82g|\xb0\xa4\xbcq\\\xa2]\xd1-(\xc1',
b'parents': [ b'parents': [

tests/test-wireproto-exchangev2.t

[ [
'\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
'\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
] ]
] ]
} }
received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
received frame(size=613; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) received frame(size=573; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
add changeset cd2534766bec add changeset cd2534766bec
add changeset e96ae20f4188 add changeset e96ae20f4188
add changeset caa2a465451d add changeset caa2a465451d
checking for updated bookmarks checking for updated bookmarks
sending 1 commands sending 1 commands
sending command manifestdata: { sending command manifestdata: {
'fields': set([ 'fields': set([
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 992f4779029a 000000000000 000000000000 0 0 992f4779029a 000000000000 000000000000
1 1 a988fb43583e 992f4779029a 000000000000 1 1 a988fb43583e 992f4779029a 000000000000
2 2 ec804e488c20 a988fb43583e 000000000000 2 2 ec804e488c20 a988fb43583e 000000000000
3 3 045c7f3927da 992f4779029a 000000000000 3 3 045c7f3927da 992f4779029a 000000000000
4 4 379cb0c2e664 045c7f3927da 000000000000 4 4 379cb0c2e664 045c7f3927da 000000000000
Phase-only update works Phase-only update works
TODO this doesn't work
$ hg -R ../server-simple phase --public -r caa2a465451dd $ hg -R ../server-simple phase --public -r caa2a465451dd
$ hg --debug pull $ hg --debug pull
pulling from http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
query 1; heads query 1; heads
sending 2 commands sending 2 commands
[ [
'\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
'\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
] ]
] ]
} }
received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
received frame(size=92; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
checking for updated bookmarks checking for updated bookmarks
2 local changesets published
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
(sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
$ hg log -G -T '{rev} {node} {phase}\n' $ hg log -G -T '{rev} {node} {phase}\n'
o 4 caa2a465451dd1facda0f5b12312c355584188a1 public o 4 caa2a465451dd1facda0f5b12312c355584188a1 draft
| |
o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 public o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft
| |
| o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
| | | |
| o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
|/ |/
o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public
[ [
'\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1',
'\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f'
] ]
] ]
} }
received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos)
received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
received frame(size=144; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) received frame(size=65; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
checking for updated bookmarks checking for updated bookmarks
updating bookmark book-1 updating bookmark book-1
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
(sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
$ hg -R client-bookmarks bookmarks $ hg -R client-bookmarks bookmarks
book-1 2:cd2534766bec book-1 2:cd2534766bec
book-2 2:cd2534766bec book-2 2:cd2534766bec