This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4486

exchangev2: fetch and apply bookmarks
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG349482d726ee: exchangev2: fetch and apply bookmarks
Summary

This is pretty similar to phases data. We collect bookmarks data
as we process records. Then at the end we make a call to the
bookmarks subsystem to reflect the remote's bookmarks.

Like phases, the code for handling bookmarks is vastly simpler
than the previous wire protocol code because the server always
transfers the full set of bookmarks when bookmarks are requested.
We don't have to keep track of whether we requested bookmarks or
not.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

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 10966.Sep 12 2018, 1:11 PM
Closed by commit rHG349482d726ee: exchangev2: fetch and apply bookmarks (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 10799

mercurial/exchangev2.py

import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
nullid, nullid,
short, short,
) )
from . import ( from . import (
bookmarks,
mdiff, mdiff,
phases, phases,
pycompat, pycompat,
setdiscovery, setdiscovery,
) )
def pull(pullop): def pull(pullop):
"""Pull using wire protocol version 2.""" """Pull using wire protocol version 2."""
# And adjust the phase of all changesets accordingly. # And adjust the phase of all changesets accordingly.
for phase in phases.phasenames: for phase in phases.phasenames:
if phase == b'secret' or not csetres['nodesbyphase'][phase]: if phase == b'secret' or not csetres['nodesbyphase'][phase]:
continue continue
phases.advanceboundary(repo, tr, phases.phasenames.index(phase), phases.advanceboundary(repo, tr, phases.phasenames.index(phase),
csetres['nodesbyphase'][phase]) csetres['nodesbyphase'][phase])
# Write bookmark updates.
bookmarks.updatefromremote(repo.ui, repo, csetres['bookmarks'],
remote.url(), pullop.gettransaction,
explicit=pullop.explicitbookmarks)
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
# 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'phase', b'revision'}, b'fields': {b'bookmarks', 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,
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} nodesbyphase = {phase: set() for phase in phases.phasenames}
remotebookmarks = {}
# 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 # This loop also aggregates non-revision metadata, such as phase
# data. # data.
def iterrevisions(): def iterrevisions():
for cset in objs: for cset in objs:
node = cset[b'node'] node = cset[b'node']
if b'phase' in cset: if b'phase' in cset:
nodesbyphase[cset[b'phase']].add(node) nodesbyphase[cset[b'phase']].add(node)
for mark in cset.get(b'bookmarks', []):
remotebookmarks[mark] = node
# Some entries might only be metadata only updates. # Some entries might only be metadata only updates.
if b'revisionsize' not in cset: if b'revisionsize' not in cset:
continue continue
data = next(objs) data = next(objs)
yield ( yield (
node, node,
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, 'nodesbyphase': nodesbyphase,
'bookmarks': remotebookmarks,
} }

tests/test-wireproto-exchangev2.t

received frame(size=43; request=1; stream=2; streamflags=; 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=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([
'bookmarks',
'parents', 'parents',
'phase', '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=871; 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
checking for updated bookmarks
updating the branch cache updating the branch cache
new changesets 3390ef850073:caa2a465451d new changesets 3390ef850073:caa2a465451d
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
received frame(size=43; request=1; stream=2; streamflags=; 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=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([
'bookmarks',
'parents', 'parents',
'phase', '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=353; 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
checking for updated bookmarks
updating the branch cache updating the branch cache
new changesets 3390ef850073:4432d83626e8 new changesets 3390ef850073:4432d83626e8
$ cd client-singlehead $ cd client-singlehead
$ hg log -G -T '{rev} {node} {phase}\n' $ hg log -G -T '{rev} {node} {phase}\n'
o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
| |
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=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([
'bookmarks',
'parents', 'parents',
'phase', '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=571; 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
checking for updated bookmarks
updating the branch cache updating the branch cache
new changesets cd2534766bec:caa2a465451d new changesets cd2534766bec:caa2a465451d
(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 draft o 4 caa2a465451dd1facda0f5b12312c355584188a1 draft
| |
o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft
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=3; 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) received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos)
searching for changes searching for changes
all remote heads known locally all remote heads known locally
sending 1 commands sending 1 commands
sending command changesetdata: { sending command changesetdata: {
'fields': set([ 'fields': set([
'bookmarks',
'parents', 'parents',
'phase', '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'
], ],
[ [
'\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=92; request=1; stream=2; streamflags=; 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) received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
checking for updated bookmarks
2 local changesets published 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 draft | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft
| | | |
| o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public
|/ |/
o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public
$ cd .. $ cd ..
Bookmarks are transferred on clone
$ hg -R server-simple bookmark -r 3390ef850073fbc2f0dfff2244342c8e9229013a book-1
$ hg -R server-simple bookmark -r cd2534766bece138c7c1afdc6825302f0f62d81f book-2
$ hg --debug clone -U http://localhost:$HGPORT/ client-bookmarks
using http://localhost:$HGPORT/
sending capabilities command
query 1; heads
sending 2 commands
sending command heads: {}
sending command known: {
'nodes': []
}
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=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)
sending 1 commands
sending command changesetdata: {
'fields': set([
'bookmarks',
'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'
]
]
}
received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
received frame(size=909; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
add changeset 3390ef850073
add changeset 4432d83626e8
add changeset cd2534766bec
add changeset e96ae20f4188
add changeset caa2a465451d
checking for updated bookmarks
adding remote bookmark book-1
adding remote bookmark book-2
updating the branch cache
new changesets 3390ef850073:caa2a465451d
$ hg -R client-bookmarks bookmarks
book-1 0:3390ef850073
book-2 2:cd2534766bec
Server-side bookmark moves are reflected during `hg pull`
$ hg -R server-simple bookmark -r cd2534766bece138c7c1afdc6825302f0f62d81f book-1
moving bookmark 'book-1' forward from 3390ef850073
$ hg -R client-bookmarks --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([
'bookmarks',
'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=144; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
checking for updated bookmarks
updating bookmark book-1
(run 'hg update' to get a working copy)
$ hg -R client-bookmarks bookmarks
book-1 2:cd2534766bec
book-2 2:cd2534766bec