This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6435

narrow: factor out logic to build ellipses related b2parts in separate fn
ClosedPublic

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

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG21e77ede77ab: narrow: factor out logic to build ellipses related b2parts in separate fn
Summary

This will help us switch more cleanly to using wireprotocol commands instead of
using exchange.pull() which exchanges more things then required.

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.May 22 2019, 5:47 PM
martinvonz added inline comments.May 23 2019, 12:42 PM
hgext/narrow/narrowbundle2.py
69

nit: common and heads are a closely related, so I'd put heads right after common here

79–80

nit: we generally work with binary nodeids, so I'd expect this new function to get the nodeids in binary form already

Closed by commit rHG21e77ede77ab: narrow: factor out logic to build ellipses related b2parts in separate fn (authored by pulkit). · Explain WhyMay 24 2019, 1:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15249

hgext/narrow/narrowbundle2.py

cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
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)
include = sorted(filter(bool, kwargs.get(r'includepats', []))) oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
exclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
newmatch = narrowspec.match(repo.root, include=include, exclude=exclude) newinclude = sorted(filter(bool, kwargs.get(r'includepats', [])))
newexclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
depth = kwargs.get(r'depth', None) generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude,
newexclude, version, common, kwargs.get('known', []),
kwargs.get(r'depth', None), heads)
def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude,
newexclude, version, common, known, depth, heads):
martinvonzUnsubmitted
Not Done

nit: common and heads are a closely related, so I'd put heads right after common here

martinvonz: nit: `common` and `heads` are a closely related, so I'd put `heads` right after `common` here
newmatch = narrowspec.match(repo.root, include=newinclude,
exclude=newexclude)
if depth is not None: if depth is not None:
depth = int(depth) depth = int(depth)
if depth < 1: if depth < 1:
raise error.Abort(_('depth must be positive, got %d') % depth) raise error.Abort(_('depth must be positive, got %d') % depth)
heads = set(heads or repo.heads()) heads = set(heads or repo.heads())
common = set(common or [nullid]) common = set(common or [nullid])
oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', []))) known = {bin(n) for n in known}
oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', []))) if known and (oldinclude != newinclude or oldexclude != newexclude):
martinvonzUnsubmitted
Not Done

nit: we generally work with binary nodeids, so I'd expect this new function to get the nodeids in binary form already

martinvonz: nit: we generally work with binary nodeids, so I'd expect this new function to get the nodeids…
known = {bin(n) for n in kwargs.get(r'known', [])}
if known and (oldinclude != include or oldexclude != exclude):
# Steps: # Steps:
# 1. Send kill for "$known & ::common" # 1. Send kill for "$known & ::common"
# #
# 2. Send changegroup for ::common # 2. Send changegroup for ::common
# #
# 3. Proceed. # 3. Proceed.
# #
# In the future, we can send kills for only the specific # In the future, we can send kills for only the specific