( )⚙ D6434 narrow: remove unrequired compat code for old versions of hg

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6434

narrow: remove unrequired compat code for old versions of hg
ClosedPublic

Authored by pulkit on May 22 2019, 5:47 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG92f584065b4f: narrow: remove unrequired compat code for old versions of hg
Summary

As the comment says, that if is only required for servers having hg version 3.1
and 3.2. Any client connecting having hg 3.1 or 3.2 locally and trying to use
narrow should already be broken taking in account the changes which have been
done since narrow moved 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.

Revision Contents
Changeset List

Diff 15248

hgext/narrow/narrowbundle2.py

# Serve a changegroup for a client with a narrow clone. # Serve a changegroup for a client with a narrow clone.
def getbundlechangegrouppart_narrow(bundler, repo, source, def getbundlechangegrouppart_narrow(bundler, repo, source,
bundlecaps=None, b2caps=None, heads=None, bundlecaps=None, b2caps=None, heads=None,
common=None, **kwargs): common=None, **kwargs):
assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') assert repo.ui.configbool('experimental', 'narrowservebrokenellipses')
cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value
cgversions = [v for v in cgversions cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)] if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions: if not cgversions:
raise ValueError(_('no common changegroup version')) raise ValueError(_('no common changegroup version'))
version = max(cgversions) version = max(cgversions)
else:
raise ValueError(_("server does not advertise changegroup version,"
" can't negotiate support for ellipsis nodes"))
include = sorted(filter(bool, kwargs.get(r'includepats', []))) include = sorted(filter(bool, kwargs.get(r'includepats', [])))
exclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
newmatch = narrowspec.match(repo.root, include=include, exclude=exclude) newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)
depth = kwargs.get(r'depth', None) depth = kwargs.get(r'depth', None)
if depth is not None: if depth is not None:
depth = int(depth) depth = int(depth)