comparison mercurial/changegroup.py @ 28231:3faba927dd93

changegroup: introduce makelookupmflinknode(dir)

This is another step towards making the manifest generation recurse
along the directory trees. It makes the two calls to _packmanifests()
more similar.

28230:0c2a088ffcc5

        tmfnodes = {}

        # Callback for the manifest, used to collect linkrevs for filelog
        # revisions.
        # Returns the linkrev node (collected in lookupcl).
        if fastpathlinkrev:
            lookupmflinknode = mfs.__getitem__
        else:
            def lookupmflinknode(x):
                """Callback for looking up the linknode for manifests.

                Returns the linkrev node for the specified manifest.

                        tmfclnodes = tmfnodes.setdefault(submf.dir(), {})
                        tmfclnode = tmfclnodes.setdefault(submf._node, clnode)
                        if clrevorder[clnode] < clrevorder[tmfclnode]:
                            tmfclnodes[n] = clnode
                return clnode

        mfnodes = self.prune(ml, mfs, commonrevs)
        size = 0
        for x in self._packmanifests('', mfnodes, lookupmflinknode):
            size += len(x)
            yield x
        for dir, nodes in tmfnodes.iteritems():
            prunednodes = self.prune(ml.dirlog(dir), nodes, commonrevs)
            for x in self._packmanifests(dir, prunednodes, nodes.get):
                size += len(x)
                yield x
        self._verbosenote(_('%8.i (manifests)\n') % size)
        yield self._manifestsdone()

28231:3faba927dd93

        tmfnodes = {}

        # Callback for the manifest, used to collect linkrevs for filelog
        # revisions.
        # Returns the linkrev node (collected in lookupcl).
        def makelookupmflinknode(dir):
            if fastpathlinkrev:
                assert not dir
                return mfs.__getitem__

            if dir:
                return tmfnodes[dir].get

            def lookupmflinknode(x):
                """Callback for looking up the linknode for manifests.

                Returns the linkrev node for the specified manifest.

                        tmfclnodes = tmfnodes.setdefault(submf.dir(), {})
                        tmfclnode = tmfclnodes.setdefault(submf._node, clnode)
                        if clrevorder[clnode] < clrevorder[tmfclnode]:
                            tmfclnodes[n] = clnode
                return clnode
            return lookupmflinknode

        mfnodes = self.prune(ml, mfs, commonrevs)
        size = 0
        for x in self._packmanifests('', mfnodes, makelookupmflinknode('')):
            size += len(x)
            yield x
        for dir, nodes in tmfnodes.iteritems():
            prunednodes = self.prune(ml.dirlog(dir), nodes, commonrevs)
            for x in self._packmanifests(dir, prunednodes,
                                         makelookupmflinknode(dir)):
                size += len(x)
                yield x
        self._verbosenote(_('%8.i (manifests)\n') % size)
        yield self._manifestsdone()