This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1663

config: rename config item to experimental.narrowservebrokenellipses
ClosedPublic

Authored by durin42 on Dec 11 2017, 3:15 PM.
Tags
None
Subscribers
None

Details

Reviewers
spectral
martinvonz
Commits
rNRWHG2fee8b001b88: config: rename config item to experimental.narrowservebrokenellipses
Summary

This is more consistent with naming things in core, and prominently
advertises how broken we think ellipsis nodes are on repositories with
complicated DAG topologies.

Diff Detail

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

Event Timeline

durin42 created this revision.Dec 11 2017, 3:15 PM
durin42 added reviewers: spectral, martinvonz.
martinvonz accepted this revision.Dec 11 2017, 7:14 PM
This revision is now accepted and ready to land.Dec 11 2017, 7:14 PM
Closed by commit rNRWHG2fee8b001b88: config: rename config item to experimental.narrowservebrokenellipses (authored by durin42). · Explain WhyDec 12 2017, 4:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msrc/__init__.py (12 lines)
Msrc/narrowbundle2.py (2 lines)

Diff 4384

src/__init__.py

narrowrepo, narrowrepo,
narrowrevlog, narrowrevlog,
narrowtemplates, narrowtemplates,
narrowwirepeer, narrowwirepeer,
) )
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem('narrow', 'serveellipses', # Narrowhg *has* support for serving ellipsis nodes (which are used at
# least by Google's internal server), but that support is pretty
# fragile and has a lot of problems on real-world repositories that
# have complex graph topologies. This could probably be corrected, but
# absent someone needing the full support for ellipsis nodes in
# repositories with merges, it's unlikely this work will get done. As
# of this writining in late 2017, all repositories large enough for
# ellipsis nodes to be a hard requirement also enforce strictly linear
# history for other scaling reasons.
configitem('experimental', 'narrowservebrokenellipses',
default=False, default=False,
alias=[('narrow', 'serveellipses')],
) )
# Export the commands table for Mercurial to see. # Export the commands table for Mercurial to see.
cmdtable = narrowcommands.table cmdtable = narrowcommands.table
localrepo.localrepository._basesupported.add(narrowrepo.requirement) localrepo.localrepository._basesupported.add(narrowrepo.requirement)
def uisetup(ui): def uisetup(ui):

src/narrowbundle2.py

version = getcgkwargs['version'] = max(cgversions) version = getcgkwargs['version'] = max(cgversions)
else: else:
raise ValueError(_("server does not advertise changegroup version," raise ValueError(_("server does not advertise changegroup version,"
" can't negotiate support for ellipsis nodes")) " can't negotiate support for ellipsis nodes"))
include = sorted(filter(bool, kwargs.get('includepats', []))) include = sorted(filter(bool, kwargs.get('includepats', [])))
exclude = sorted(filter(bool, kwargs.get('excludepats', []))) exclude = sorted(filter(bool, kwargs.get('excludepats', [])))
newmatch = narrowspec.match(repo.root, include=include, exclude=exclude) newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)
if not repo.ui.configbool("narrow", "serveellipses"): if not repo.ui.configbool("experimental", "narrowservebrokenellipses"):
outgoing = exchange._computeoutgoing(repo, heads, common) outgoing = exchange._computeoutgoing(repo, heads, common)
if not outgoing.missing: if not outgoing.missing:
return return
if util.safehasattr(changegroup, 'getsubsetraw'): if util.safehasattr(changegroup, 'getsubsetraw'):
# getsubsetraw was replaced with makestream in hg in 92f1e2be8ab6 # getsubsetraw was replaced with makestream in hg in 92f1e2be8ab6
# (2017/09/10). # (2017/09/10).
packer = changegroup.getbundler(version, repo) packer = changegroup.getbundler(version, repo)
packer._narrow_matcher = lambda : newmatch packer._narrow_matcher = lambda : newmatch