comparison mercurial/localrepo.py @ 13811:65c1d309ab91

changegroup: remove nodeiter temporary

13810:0252abaafb8a

            efiles = len(changedfiles)
            changecount = count[0]
            self.ui.progress(_('bundling'), None)

            mnfst = self.manifest
            nodeiter = gennodelst(mnfst)
            count = [0]
            def mlookup(revlog, x):
                count[0] += 1
                self.ui.progress(_('bundling'), count[0],
                                 unit=_('manifests'), total=changecount)
                return cl.node(revlog.linkrev(revlog.rev(x)))

            for chunk in mnfst.group(nodeiter, mlookup):
                yield chunk
            self.ui.progress(_('bundling'), None)

            for idx, fname in enumerate(sorted(changedfiles)):
                filerevlog = self.file(fname)
                if not len(filerevlog):
                    raise util.Abort(_("empty or missing revlog for %s") % fname)
                first = True
                nodeiter = gennodelst(filerevlog)
                def flookup(revlog, x):
                    self.ui.progress(
                        _('bundling'), idx, item=fname,
                        total=efiles, unit=_('files'))
                    return cl.node(revlog.linkrev(revlog.rev(x)))

                for chunk in filerevlog.group(nodeiter, flookup):
                    if first:
                        if chunk == changegroup.closechunk():
                            break
                        yield changegroup.chunkheader(len(fname))
                        yield fname

13811:65c1d309ab91

            efiles = len(changedfiles)
            changecount = count[0]
            self.ui.progress(_('bundling'), None)

            mnfst = self.manifest
            count = [0]
            def mlookup(revlog, x):
                count[0] += 1
                self.ui.progress(_('bundling'), count[0],
                                 unit=_('manifests'), total=changecount)
                return cl.node(revlog.linkrev(revlog.rev(x)))

            for chunk in mnfst.group(gennodelst(mnfst), mlookup):
                yield chunk
            self.ui.progress(_('bundling'), None)

            for idx, fname in enumerate(sorted(changedfiles)):
                filerevlog = self.file(fname)
                if not len(filerevlog):
                    raise util.Abort(_("empty or missing revlog for %s") % fname)
                first = True
                def flookup(revlog, x):
                    self.ui.progress(
                        _('bundling'), idx, item=fname,
                        total=efiles, unit=_('files'))
                    return cl.node(revlog.linkrev(revlog.rev(x)))

                for chunk in filerevlog.group(gennodelst(filerevlog), flookup):
                    if first:
                        if chunk == changegroup.closechunk():
                            break
                        yield changegroup.chunkheader(len(fname))
                        yield fname