comparison mercurial/changegroup.py @ 41767:1c1c4ef8b72e

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

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().

Differential Revision: https://phab.mercurial-scm.org/D6004

41766:cd7059d17cb2

                # No nodes to send because this directory is out of
                # the client's view of the repository (probably
                # because of narrow clones). Do this even for the root
                # directory (tree=='')
                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:
                # Avoid sending any manifest nodes we can prove the
                # client already has by checking linkrevs. See the
                # related comment in generatefiles().
                prunednodes = self._prunemanifests(store, nodes, commonrevs)

                    pass
                if not tree:
                    yield tree, []

    def _prunemanifests(self, store, nodes, commonrevs):
        # This is split out as a separate method to allow filtering
        # commonrevs in extension code.
        #
        # TODO(augie): this shouldn't be required, instead we should
        # make filtering of revisions to send delegated to the store

41767:1c1c4ef8b72e

                # No nodes to send because this directory is out of
                # the client's view of the repository (probably
                # because of narrow clones). Do this even for the root
                # directory (tree=='')
                prunednodes = []
            else:
                # Avoid sending any manifest nodes we can prove the
                # client already has by checking linkrevs. See the
                # related comment in generatefiles().
                prunednodes = self._prunemanifests(store, nodes, commonrevs)

                    pass
                if not tree:
                    yield tree, []

    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
        # commonrevs in extension code.
        #
        # TODO(augie): this shouldn't be required, instead we should
        # make filtering of revisions to send delegated to the store