This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4809

narrow: move the ellipses server capability to core
ClosedPublic

Authored by pulkit on Sep 29 2018, 8:04 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa24f4638d6c1: narrow: move the ellipses server capability to core
Summary

This will be used in core logic to determining whether a server is ellipses
enabled or not. And also this will ease moving narrow related things to core.

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

pulkit created this revision.Sep 29 2018, 8:04 PM
pulkit updated this revision to Diff 11500.Sep 30 2018, 12:10 PM
martinvonz added a subscriber: martinvonz.Sep 30 2018, 7:44 PM
martinvonz added inline comments.
tests/test-narrow-clone.t
48 ↗(On Diff #11500)

This doesn't look right. I suspect it was done by a mistaken run-tests.py -i

pulkit added inline comments.Sep 30 2018, 8:07 PM
tests/test-narrow-clone.t
48 ↗(On Diff #11500)

I just ran run-tests.py -i and it popped up and I accepted it. I will check if the test pass without this change or not.

martinvonz added inline comments.Oct 1 2018, 2:02 AM
mercurial/hg.py
582–583 ↗(On Diff #11500)

This patch seems to do more than what it says, and more than what the previous patch did. Can we separate out this functional change? IIUC, this makes it so we start writing the ellipses requirement to the clone if the source repo has the ellipses capability. I'm not sure that's the right thing to do -- just because the server supports ellipses doesn't necessarily mean that all users want that. I know they user/client has no say on that decision (it's controlled by the "narrowservebrokenellipses" config), but we might want to change that. OTOH, since that's how the server currently works, it's probably fine to set the requirement based on the server capability. I mostly just wanted to make sure keep this in mind. (But I would still prefer to see the refactoring separated from the functional change.)

martinvonz added inline comments.Oct 1 2018, 2:08 AM
mercurial/hg.py
582–583 ↗(On Diff #11500)

Oh, I think you actually meant to leave this change for the next patch, right? Because ELLIPSES_REQUIREMENT that's used below doesn't seem to exist yet.

tests/test-narrow-clone.t
48 ↗(On Diff #11500)

I forgot to say earlier that it's a common problem with run-tests.py -i that it doesn't know where to put lines around optional lines. So I'm pretty sure the test will pass even if you revert this change.

pulkit updated this revision to Diff 11516.Oct 1 2018, 12:01 PM
pulkit added a comment.Oct 1 2018, 12:11 PM

@martinvonz I have removed the logic of adding a new ellipses requirement from current series as coupling that and this series for review turned out to be a bad idea. This series now only tries to do some cleanup and introduce a new wireprotocol command.

martinvonz added a comment.Oct 1 2018, 12:11 PM

btw, "narrow: move the ellipses server capability to core" should probably be changed to more closely match "narrow: move the ellipses server capability to core"

indygreg accepted this revision.Oct 1 2018, 12:53 PM
This revision is now accepted and ready to land.Oct 1 2018, 12:53 PM
Closed by commit rHGa24f4638d6c1: narrow: move the ellipses server capability to core (authored by pulkit). · Explain WhyOct 1 2018, 12:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11524

hgext/narrow/narrowcommands.py

repair, repair,
repository, repository,
repoview, repoview,
sparse, sparse,
util, util,
wireprotoserver, wireprotoserver,
) )
from . import (
narrowwirepeer,
)
table = {} table = {}
command = registrar.command(table) command = registrar.command(table)
def setup(): def setup():
"""Wraps user-facing mercurial commands with narrow-aware versions.""" """Wraps user-facing mercurial commands with narrow-aware versions."""
entry = extensions.wrapcommand(commands.table, 'clone', clonenarrowcmd) entry = extensions.wrapcommand(commands.table, 'clone', clonenarrowcmd)
entry[1].append(('', 'narrow', None, entry[1].append(('', 'narrow', None,
kwargs['narrow'] = True kwargs['narrow'] = True
include, exclude = repo.narrowpats include, exclude = repo.narrowpats
kwargs['oldincludepats'] = include kwargs['oldincludepats'] = include
kwargs['oldexcludepats'] = exclude kwargs['oldexcludepats'] = exclude
kwargs['includepats'] = include kwargs['includepats'] = include
kwargs['excludepats'] = exclude kwargs['excludepats'] = exclude
# calculate known nodes only in ellipses cases because in non-ellipses cases # calculate known nodes only in ellipses cases because in non-ellipses cases
# we have all the nodes # we have all the nodes
if narrowwirepeer.ELLIPSESCAP in pullop.remote.capabilities(): if wireprotoserver.ELLIPSESCAP in pullop.remote.capabilities():
kwargs['known'] = [node.hex(ctx.node()) for ctx in kwargs['known'] = [node.hex(ctx.node()) for ctx in
repo.set('::%ln', pullop.common) repo.set('::%ln', pullop.common)
if ctx.node() != node.nullid] if ctx.node() != node.nullid]
if not kwargs['known']: if not kwargs['known']:
# Mercurial serializes an empty list as '' and deserializes it as # Mercurial serializes an empty list as '' and deserializes it as
# [''], so delete it instead to avoid handling the empty string on # [''], so delete it instead to avoid handling the empty string on
# the server. # the server.
del kwargs['known'] del kwargs['known']

hgext/narrow/narrowrepo.py

# narrowrepo.py - repository which supports narrow revlogs, lazy loading # narrowrepo.py - repository which supports narrow revlogs, lazy loading
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
wireprotoserver, wireprotoserver,
) )
from . import ( from . import (
narrowdirstate, narrowdirstate,
narrowwirepeer,
) )
def wraprepo(repo): def wraprepo(repo):
"""Enables narrow clone functionality on a single local repository.""" """Enables narrow clone functionality on a single local repository."""
class narrowrepository(repo.__class__): class narrowrepository(repo.__class__):
def _makedirstate(self): def _makedirstate(self):
dirstate = super(narrowrepository, self)._makedirstate() dirstate = super(narrowrepository, self)._makedirstate()
return narrowdirstate.wrapdirstate(self, dirstate) return narrowdirstate.wrapdirstate(self, dirstate)
def peer(self): def peer(self):
peer = super(narrowrepository, self).peer() peer = super(narrowrepository, self).peer()
peer._caps.add(wireprotoserver.NARROWCAP) peer._caps.add(wireprotoserver.NARROWCAP)
peer._caps.add(narrowwirepeer.ELLIPSESCAP) peer._caps.add(wireprotoserver.ELLIPSESCAP)
return peer return peer
repo.__class__ = narrowrepository repo.__class__ = narrowrepository

hgext/narrow/narrowwirepeer.py

# narrowwirepeer.py - passes narrow spec with unbundle command # narrowwirepeer.py - passes narrow spec with unbundle command
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
extensions, extensions,
hg, hg,
wireprotoserver, wireprotoserver,
wireprotov1server, wireprotov1server,
) )
ELLIPSESCAP = 'exp-ellipses-1'
def uisetup(): def uisetup():
extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap)
def addnarrowcap(orig, repo, proto): def addnarrowcap(orig, repo, proto):
"""add the narrow capability to the server""" """add the narrow capability to the server"""
caps = orig(repo, proto) caps = orig(repo, proto)
caps.append(wireprotoserver.NARROWCAP) caps.append(wireprotoserver.NARROWCAP)
if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): if repo.ui.configbool('experimental', 'narrowservebrokenellipses'):
caps.append(ELLIPSESCAP) caps.append(wireprotoserver.ELLIPSESCAP)
return caps return caps
def reposetup(repo): def reposetup(repo):
def wirereposetup(ui, peer): def wirereposetup(ui, peer):
def wrapped(orig, cmd, *args, **kwargs): def wrapped(orig, cmd, *args, **kwargs):
if cmd == 'unbundle': if cmd == 'unbundle':
# TODO: don't blindly add include/exclude wireproto # TODO: don't blindly add include/exclude wireproto
# arguments to unbundle. # arguments to unbundle.
include, exclude = repo.narrowpats include, exclude = repo.narrowpats
kwargs[r"includepats"] = ','.join(include) kwargs[r"includepats"] = ','.join(include)
kwargs[r"excludepats"] = ','.join(exclude) kwargs[r"excludepats"] = ','.join(exclude)
return orig(cmd, *args, **kwargs) return orig(cmd, *args, **kwargs)
extensions.wrapfunction(peer, '_calltwowaystream', wrapped) extensions.wrapfunction(peer, '_calltwowaystream', wrapped)
hg.wirepeersetupfuncs.append(wirereposetup) hg.wirepeersetupfuncs.append(wirereposetup)

mercurial/wireprotoserver.py

HTTP_OK = 200 HTTP_OK = 200
HGTYPE = 'application/mercurial-0.1' HGTYPE = 'application/mercurial-0.1'
HGTYPE2 = 'application/mercurial-0.2' HGTYPE2 = 'application/mercurial-0.2'
HGERRTYPE = 'application/hg-error' HGERRTYPE = 'application/hg-error'
NARROWCAP = 'exp-narrow-1' NARROWCAP = 'exp-narrow-1'
ELLIPSESCAP = 'exp-ellipses-1'
SSHV1 = wireprototypes.SSHV1 SSHV1 = wireprototypes.SSHV1
SSHV2 = wireprototypes.SSHV2 SSHV2 = wireprototypes.SSHV2
def decodevaluefromheaders(req, headerprefix): def decodevaluefromheaders(req, headerprefix):
"""Decode a long value from multiple HTTP request headers. """Decode a long value from multiple HTTP request headers.
Returns the value as a bytes, not a str. Returns the value as a bytes, not a str.