This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6004

changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests()
ClosedPublic

Authored by martinvonz on Feb 22 2019, 12:31 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1c1c4ef8b72e: changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests()
Summary

Google has an extension that overrides _prunemanifests() and removes
nodes that we fetch using another mechanism. That broke when
_prunemanifests() no longer got called. It works again if we move the
check for "not self._ellipses" inside _prunemanifests().

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

martinvonz created this revision.Feb 22 2019, 12:31 AM
martinvonz retitled this revision from changegroup: moving non-pruning pf non-ellipsis manifests to _prunemanifests() to changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests().Feb 22 2019, 12:38 AM
pulkit accepted this revision.Feb 22 2019, 6:31 AM
Closed by commit rHG1c1c4ef8b72e: changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests() (authored by martinvonz). · Explain WhyFeb 22 2019, 6:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (10 lines)

Diff 14190

mercurial/changegroup.py

store = mfl.getstorage(tree) store = mfl.getstorage(tree)
if not should_visit: if not should_visit:
# No nodes to send because this directory is out of # No nodes to send because this directory is out of
# the client's view of the repository (probably # the client's view of the repository (probably
# because of narrow clones). Do this even for the root # because of narrow clones). Do this even for the root
# directory (tree=='') # directory (tree=='')
prunednodes = [] prunednodes = []
elif not self._ellipses:
# In non-ellipses case and large repositories, it is better to
# prevent calling of store.rev and store.linkrev on a lot of
# nodes as compared to sending some extra data
prunednodes = nodes.copy()
else: else:
# Avoid sending any manifest nodes we can prove the # Avoid sending any manifest nodes we can prove the
# client already has by checking linkrevs. See the # client already has by checking linkrevs. See the
# related comment in generatefiles(). # related comment in generatefiles().
prunednodes = self._prunemanifests(store, nodes, commonrevs) prunednodes = self._prunemanifests(store, nodes, commonrevs)
if tree and not prunednodes: if tree and not prunednodes:
continue continue
# we are not going to send it because a side-effect is that # we are not going to send it because a side-effect is that
# it updates tmdnodes (via lookupfn) # it updates tmdnodes (via lookupfn)
for d in deltas: for d in deltas:
pass pass
if not tree: if not tree:
yield tree, [] yield tree, []
def _prunemanifests(self, store, nodes, commonrevs): def _prunemanifests(self, store, nodes, commonrevs):
if not self._ellipses:
# In non-ellipses case and large repositories, it is better to
# prevent calling of store.rev and store.linkrev on a lot of
# nodes as compared to sending some extra data
return nodes.copy()
# This is split out as a separate method to allow filtering # This is split out as a separate method to allow filtering
# commonrevs in extension code. # commonrevs in extension code.
# #
# TODO(augie): this shouldn't be required, instead we should # TODO(augie): this shouldn't be required, instead we should
# make filtering of revisions to send delegated to the store # make filtering of revisions to send delegated to the store
# layer. # layer.
frev, flr = store.rev, store.linkrev frev, flr = store.rev, store.linkrev
return [n for n in nodes if flr(frev(n)) not in commonrevs] return [n for n in nodes if flr(frev(n)) not in commonrevs]