This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7098

widening: trust user to give full "known" set
ClosedPublic

Authored by martinvonz on Oct 14 2019, 1:57 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2673f9a74968: widening: trust user to give full "known" set
rHGa4d4e3d46421: widening: trust user to give full "known" set
rHGd0cd26a7c7a7: widening: trust user to give full "known" set
Summary

The new narrow_widen wire protocol command is supposed to return data
for exactly the revisions that the client requested (in order for it
to be strip-free). So we should not add ancestors the client didn't
ask for.

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 (8 lines)

Diff 17216

hgext/narrow/narrowbundle2.py

# nodes we know should go away or change shape, and then # nodes we know should go away or change shape, and then
# send a data stream that tells the client something like this: # send a data stream that tells the client something like this:
# #
# a) apply this changegroup # a) apply this changegroup
# b) apply nodes XXX, YYY, ZZZ that you already have # b) apply nodes XXX, YYY, ZZZ that you already have
# c) goto a # c) goto a
# #
# until they've built up the full new state. # until they've built up the full new state.
# Convert to revnums and intersect with "common". The client should knownrevs = {repo.changelog.rev(n) for n in known}
# have made it a subset of "common" already, but let's be safe.
known = set(repo.revs(b"%ln & ::%ln", known, common))
# TODO: we could send only roots() of this set, and the # TODO: we could send only roots() of this set, and the
# list of nodes in common, and the client could work out # list of nodes in common, and the client could work out
# what to strip, instead of us explicitly sending every # what to strip, instead of us explicitly sending every
# single node. # single node.
deadrevs = known deadrevs = knownrevs
def genkills(): def genkills():
for r in deadrevs: for r in deadrevs:
yield _KILLNODESIGNAL yield _KILLNODESIGNAL
yield repo.changelog.node(r) yield repo.changelog.node(r)
yield _DONESIGNAL yield _DONESIGNAL
bundler.newpart(_CHANGESPECPART, data=genkills()) bundler.newpart(_CHANGESPECPART, data=genkills())
newvisit, newfull, newellipsis = exchange._computeellipsis( newvisit, newfull, newellipsis = exchange._computeellipsis(
repo, set(), common, known, newmatch repo, set(), common, knownrevs, newmatch
) )
if newvisit: if newvisit:
packer = changegroup.getbundler( packer = changegroup.getbundler(
version, version,
repo, repo,
matcher=newmatch, matcher=newmatch,
ellipses=True, ellipses=True,
shallow=False, shallow=False,