This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6444

narrow: pass binary nodeids to generateellipsesbundle2()
ClosedPublic

Authored by pulkit on May 24 2019, 9:02 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGf66628c15e6f: narrow: pass binary nodeids to generateellipsesbundle2()
Summary

We generally work with binary nodeids and it's should be expected that new
function gets the nodeids in binary form already.

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

PathPackages
Mhgext/narrow/narrowbundle2.py (4 lines)

Diff 15254

hgext/narrow/narrowbundle2.py

if not cgversions: if not cgversions:
raise ValueError(_('no common changegroup version')) raise ValueError(_('no common changegroup version'))
version = max(cgversions) version = max(cgversions)
oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', []))) oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', []))) oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
newinclude = sorted(filter(bool, kwargs.get(r'includepats', []))) newinclude = sorted(filter(bool, kwargs.get(r'includepats', [])))
newexclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) newexclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
known = {bin(n) for n in kwargs.get('known', [])}
generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude,
newexclude, version, common, kwargs.get('known', []), newexclude, version, common, known,
kwargs.get(r'depth', None), heads) kwargs.get(r'depth', None), heads)
def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude,
newexclude, version, common, known, depth, heads): newexclude, version, common, known, depth, heads):
newmatch = narrowspec.match(repo.root, include=newinclude, newmatch = narrowspec.match(repo.root, include=newinclude,
exclude=newexclude) 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])
known = {bin(n) for n in known}
if known and (oldinclude != newinclude or oldexclude != newexclude): if known and (oldinclude != newinclude or oldexclude != newexclude):
# 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.
# #