comparison mercurial/localrepo.py @ 13787:5333c87f6048

changegroup: fold filenode collector into mlookup

13786:4ed718f909e5

        # slow path
        self.hook('preoutgoing', throw=True, source=source)
        self.changegroupinfo(csets, source)

        # A function generating function that sets up the initial environment
        # the inner function.
        def filenode_collector(changedfiles):
            # This gathers information from each manifestnode included in the
            # changegroup about which filenodes the manifest node references
            # so we can include those in the changegroup too.
            #
            # It also remembers which changenode each filenode belongs to.  It
            # does this by assuming the a filenode belongs to the changenode
            # the first manifest that references it belongs to.
            def collect(mnode):
                r = mf.rev(mnode)
                clnode = mfs[mnode]
                mdata = mf.readfast(mnode)
                for f in changedfiles:
                    if f in mdata:
                        fnodes.setdefault(f, {}).setdefault(mdata[f], clnode)

            return collect

        # If we determine that a particular file or manifest node must be a
        # node that the recipient of the changegroup will already have, we can
        # also assume the recipient will have all the parents.  This function
        # prunes them from the set of missing nodes.
        def prune(revlog, missingnodes):

            self.ui.progress(_('bundling'), None)

            prune(mf, mfs)
            # Create a generator for the manifestnodes that calls our lookup
            # and data collection functions back.
            fcollect = filenode_collector(changedfiles)
            count = [0]
            def mlookup(revlog, x):
                fcollect(x)
                count[0] += 1
                self.ui.progress(_('bundling'), count[0],
                                 unit=_('manifests'), total=changecount)
                return mfs[x]

13787:5333c87f6048

        # slow path
        self.hook('preoutgoing', throw=True, source=source)
        self.changegroupinfo(csets, source)

        # If we determine that a particular file or manifest node must be a
        # node that the recipient of the changegroup will already have, we can
        # also assume the recipient will have all the parents.  This function
        # prunes them from the set of missing nodes.
        def prune(revlog, missingnodes):

            self.ui.progress(_('bundling'), None)

            prune(mf, mfs)
            # Create a generator for the manifestnodes that calls our lookup
            # and data collection functions back.
            count = [0]
            def mlookup(revlog, x):
                clnode = mfs[x]
                mdata = mf.readfast(x)
                for f in changedfiles:
                    if f in mdata:
                        fnodes.setdefault(f, {}).setdefault(mdata[f], clnode)
                count[0] += 1
                self.ui.progress(_('bundling'), count[0],
                                 unit=_('manifests'), total=changecount)
                return mfs[x]