This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4484

exchangev2: fetch and apply phases data
ClosedPublic

Authored by indygreg on Sep 5 2018, 12:20 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGff2de4f2eb3c: exchangev2: fetch and apply phases data
Summary

Now that the server supports emitting phases data, we can request it
and apply it on the client.

Because we may receive phases-only updates from the server, we no
longer conditionally perform the "changesetdata" command depending
on whether there are revisions to fetch. In the previous wire
protocol, this case would result in us falling back to performing
"listkeys" commands to look up phases, bookmarks, etc data. But
since "changesetdata" is smart enough to handle metadata only
fetches, we can keep things consistent.

It's worth noting that because of the unified approach to changeset
data retrieval, phase handling code in wire proto v2 exchange is
drastically simpler. Contrast with all the code in exchange.py
dealing with all the variations for obtaining phases data.

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.

Event Timeline

indygreg created this revision.Sep 5 2018, 12:20 PM
durin42 accepted this revision.Sep 12 2018, 11:15 AM
This revision is now accepted and ready to land.Sep 12 2018, 11:15 AM
indygreg updated this revision to Diff 10964.Sep 12 2018, 1:11 PM
Closed by commit rHGff2de4f2eb3c: exchangev2: fetch and apply phases data (authored by indygreg). · Explain WhySep 14 2018, 11:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11062

mercurial/exchangev2.py

from .i18n import _ from .i18n import _
from .node import ( from .node import (
nullid, nullid,
short, short,
) )
from . import ( from . import (
mdiff, mdiff,
phases,
pycompat, pycompat,
setdiscovery, setdiscovery,
) )
def pull(pullop): def pull(pullop):
"""Pull using wire protocol version 2.""" """Pull using wire protocol version 2."""
repo = pullop.repo repo = pullop.repo
remote = pullop.remote remote = pullop.remote
tr = pullop.trmanager.transaction() tr = pullop.trmanager.transaction()
# Figure out what needs to be fetched. # Figure out what needs to be fetched.
common, fetch, remoteheads = _pullchangesetdiscovery( common, fetch, remoteheads = _pullchangesetdiscovery(
repo, remote, pullop.heads, abortwhenunrelated=pullop.force) repo, remote, pullop.heads, abortwhenunrelated=pullop.force)
# And fetch the data.
pullheads = pullop.heads or remoteheads pullheads = pullop.heads or remoteheads
_fetchchangesets(repo, tr, remote, common, fetch, pullheads) csetres = _fetchchangesets(repo, tr, remote, common, fetch, pullheads)
# New revisions are written to the changelog. But all other updates
# are deferred. Do those now.
# Ensure all new changesets are draft by default. If the repo is
# publishing, the phase will be adjusted by the loop below.
if csetres['added']:
phases.registernew(repo, tr, phases.draft, csetres['added'])
# And adjust the phase of all changesets accordingly.
for phase in phases.phasenames:
if phase == b'secret' or not csetres['nodesbyphase'][phase]:
continue
phases.advanceboundary(repo, tr, phases.phasenames.index(phase),
csetres['nodesbyphase'][phase])
def _pullchangesetdiscovery(repo, remote, heads, abortwhenunrelated=True): def _pullchangesetdiscovery(repo, remote, heads, abortwhenunrelated=True):
"""Determine which changesets need to be pulled.""" """Determine which changesets need to be pulled."""
if heads: if heads:
knownnode = repo.changelog.hasnode knownnode = repo.changelog.hasnode
if all(knownnode(head) for head in heads): if all(knownnode(head) for head in heads):
return heads, False, heads return heads, False, heads
if set(remoteheads).issubset(common): if set(remoteheads).issubset(common):
fetch = [] fetch = []
common.discard(nullid) common.discard(nullid)
return common, fetch, remoteheads return common, fetch, remoteheads
def _fetchchangesets(repo, tr, remote, common, fetch, remoteheads): def _fetchchangesets(repo, tr, remote, common, fetch, remoteheads):
if not fetch:
return
# TODO consider adding a step here where we obtain the DAG shape first # TODO consider adding a step here where we obtain the DAG shape first
# (or ask the server to slice changesets into chunks for us) so that # (or ask the server to slice changesets into chunks for us) so that
# we can perform multiple fetches in batches. This will facilitate # we can perform multiple fetches in batches. This will facilitate
# resuming interrupted clones, higher server-side cache hit rates due # resuming interrupted clones, higher server-side cache hit rates due
# to smaller segments, etc. # to smaller segments, etc.
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
objs = e.callcommand(b'changesetdata', { objs = e.callcommand(b'changesetdata', {
b'noderange': [sorted(common), sorted(remoteheads)], b'noderange': [sorted(common), sorted(remoteheads)],
b'fields': {b'parents', b'revision'}, b'fields': {b'parents', b'phase', b'revision'},
}).result() }).result()
# The context manager waits on all response data when exiting. So # The context manager waits on all response data when exiting. So
# we need to remain in the context manager in order to stream data. # we need to remain in the context manager in order to stream data.
return _processchangesetdata(repo, tr, objs) return _processchangesetdata(repo, tr, objs)
def _processchangesetdata(repo, tr, objs): def _processchangesetdata(repo, tr, objs):
repo.hook('prechangegroup', throw=True, repo.hook('prechangegroup', throw=True,
def linkrev(node): def linkrev(node):
repo.ui.debug('add changeset %s\n' % short(node)) repo.ui.debug('add changeset %s\n' % short(node))
# Linkrev for changelog is always self. # Linkrev for changelog is always self.
return len(cl) return len(cl)
def onchangeset(cl, node): def onchangeset(cl, node):
progress.increment() progress.increment()
nodesbyphase = {phase: set() for phase in phases.phasenames}
# addgroup() expects a 7-tuple describing revisions. This normalizes # addgroup() expects a 7-tuple describing revisions. This normalizes
# the wire data to that format. # the wire data to that format.
#
# This loop also aggregates non-revision metadata, such as phase
# data.
def iterrevisions(): def iterrevisions():
for cset in objs: for cset in objs:
assert b'revisionsize' in cset node = cset[b'node']
if b'phase' in cset:
nodesbyphase[cset[b'phase']].add(node)
# Some entries might only be metadata only updates.
if b'revisionsize' not in cset:
continue
data = next(objs) data = next(objs)
yield ( yield (
cset[b'node'], node,
cset[b'parents'][0], cset[b'parents'][0],
cset[b'parents'][1], cset[b'parents'][1],
# Linknode is always itself for changesets. # Linknode is always itself for changesets.
cset[b'node'], cset[b'node'],
# We always send full revisions. So delta base is not set. # We always send full revisions. So delta base is not set.
nullid, nullid,
mdiff.trivialdiffheader(len(data)) + data, mdiff.trivialdiffheader(len(data)) + data,
# Flags not yet supported. # Flags not yet supported.
0, 0,
) )
added = cl.addgroup(iterrevisions(), linkrev, weakref.proxy(tr), added = cl.addgroup(iterrevisions(), linkrev, weakref.proxy(tr),
addrevisioncb=onchangeset) addrevisioncb=onchangeset)
progress.complete() progress.complete()
return { return {
'added': added, 'added': added,
'nodesbyphase': nodesbyphase,
} }

tests/test-wireproto-exchangev2.t

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)
received frame(size=11; request=3; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=11; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=1; request=3; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=1; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
sending 1 commands sending 1 commands
sending command changesetdata: { sending command changesetdata: {
'fields': set([ 'fields': set([
'parents', 'parents',
'phase',
'revision' 'revision'
]), ]),
'noderange': [ 'noderange': [
[], [],
[ [
'\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=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
received frame(size=809; request=1; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=871; request=1; stream=2; streamflags=; 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 3390ef850073 add changeset 3390ef850073
add changeset 4432d83626e8 add changeset 4432d83626e8
add changeset cd2534766bec add changeset cd2534766bec
add changeset e96ae20f4188 add changeset e96ae20f4188
add changeset caa2a465451d add changeset caa2a465451d
updating the branch cache updating the branch cache
new changesets 3390ef850073:caa2a465451d new changesets 3390ef850073:caa2a465451d (3 drafts)
All changesets should have been transferred All changesets should have been transferred
$ hg -R client-simple debugindex -c $ hg -R client-simple debugindex -c
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 3390ef850073 000000000000 000000000000 0 0 3390ef850073 000000000000 000000000000
1 1 4432d83626e8 3390ef850073 000000000000 1 1 4432d83626e8 3390ef850073 000000000000
2 2 cd2534766bec 4432d83626e8 000000000000 2 2 cd2534766bec 4432d83626e8 000000000000
3 3 e96ae20f4188 3390ef850073 000000000000 3 3 e96ae20f4188 3390ef850073 000000000000
4 4 caa2a465451d e96ae20f4188 000000000000 4 4 caa2a465451d e96ae20f4188 000000000000
$ hg -R client-simple log -G -T '{rev} {node} {phase}\n' $ hg -R client-simple 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 public | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
| | | |
| o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
|/ |/
o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public
Cloning only a specific revision works Cloning only a specific revision works
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)
received frame(size=11; request=3; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=11; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=1; request=3; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=1; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
sending 1 commands sending 1 commands
sending command changesetdata: { sending command changesetdata: {
'fields': set([ 'fields': set([
'parents', 'parents',
'phase',
'revision' 'revision'
]), ]),
'noderange': [ 'noderange': [
[], [],
[ [
'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0' 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0'
] ]
] ]
} }
received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
received frame(size=327; request=1; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=353; request=1; stream=2; streamflags=; 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 3390ef850073 add changeset 3390ef850073
add changeset 4432d83626e8 add changeset 4432d83626e8
updating the branch cache updating the branch cache
new changesets 3390ef850073:4432d83626e8 new changesets 3390ef850073:4432d83626e8
$ cd client-singlehead $ cd client-singlehead
received frame(size=2; request=3; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=2; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
searching for changes searching for changes
all local heads known remotely all local heads known remotely
sending 1 commands sending 1 commands
sending command changesetdata: { sending command changesetdata: {
'fields': set([ 'fields': set([
'parents', 'parents',
'phase',
'revision' 'revision'
]), ]),
'noderange': [ 'noderange': [
[ [
'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0' 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0'
], ],
[ [
'\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=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation) received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
received frame(size=495; request=1; stream=2; streamflags=; type=command-response; flags=continuation) received frame(size=571; request=1; stream=2; streamflags=; 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
updating the branch cache updating the branch cache
new changesets cd2534766bec:caa2a465451d new changesets cd2534766bec:caa2a465451d (3 drafts)
(run 'hg update' to get a working copy)
$ hg log -G -T '{rev} {node} {phase}\n'
o 4 caa2a465451dd1facda0f5b12312c355584188a1 draft
|
o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft
|
| o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
| |
| o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
|/
o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public
Phase-only update works
$ hg -R ../server-simple phase --public -r caa2a465451dd
$ hg --debug pull
pulling from http://localhost:$HGPORT/
using http://localhost:$HGPORT/
sending capabilities command
query 1; heads
sending 2 commands
sending command heads: {}
sending command known: {
'nodes': [
'\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f',
'\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1'
]
}
received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
received frame(size=43; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
received frame(size=11; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=3; request=3; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
searching for changes
all remote heads known locally
sending 1 commands
sending command changesetdata: {
'fields': set([
'parents',
'phase',
'revision'
]),
'noderange': [
[
'\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'
],
[
'\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'
]
]
}
received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
received frame(size=92; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
2 local changesets published
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg log -G -T '{rev} {node} {phase}\n' $ hg log -G -T '{rev} {node} {phase}\n'
o 4 caa2a465451dd1facda0f5b12312c355584188a1 public o 4 caa2a465451dd1facda0f5b12312c355584188a1 public
| |
o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 public o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 public
| |
| o 2 cd2534766bece138c7c1afdc6825302f0f62d81f public | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
| | | |
| o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
|/ |/
o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public
$ cd .. $ cd ..