mercurial/localrepo.py

10429:1c50a954a524

        try:
            trp = weakref.proxy(tr)
            # pull off the changeset group
            self.ui.status(_("adding changesets\n"))
            clstart = len(cl)
            chunkiter = changegroup.chunkiter(source)
            if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
                raise util.Abort(_("received changelog group is empty"))
            clend = len(cl)
            changesets = clend - clstart

            # pull off the manifest group
            self.ui.status(_("adding manifests\n"))
            chunkiter = changegroup.chunkiter(source)
            # no need to check for empty manifest group here:
            # if the result of the merge of 1 and 2 is the same in 3 and 4,
            # no new manifest will be created and the manifest group will
            # be empty during the pull
            self.manifest.addgroup(chunkiter, revmap, trp)

            needfiles = {}
            if self.ui.configbool('server', 'validate', default=False):
                # validate incoming csets have their manifests
                for cset in xrange(clstart, clend):

                    for f, n in mfest.iteritems():
                        needfiles.setdefault(f, set()).add(n)

            # process the files
            self.ui.status(_("adding file changes\n"))
            while 1:
                f = changegroup.getchunk(source)
                if not f:
                    break
                self.ui.debug("adding %s revisions\n" % f)
                fl = self.file(f)
                o = len(fl)
                chunkiter = changegroup.chunkiter(source)
                if fl.addgroup(chunkiter, revmap, trp) is None:
                    raise util.Abort(_("received file revlog group is empty"))
                revisions += len(fl) - o
                files += 1
                if f in needfiles:

                        n = fl.node(new)
                        if n in needs:
                            needs.remove(n)
                    if not needs:
                        del needfiles[f]

            for f, needs in needfiles.iteritems():
                fl = self.file(f)
                for n in needs:
                    try:

10430:5cef810e588f

        try:
            trp = weakref.proxy(tr)
            # pull off the changeset group
            self.ui.status(_("adding changesets\n"))
            clstart = len(cl)
            class prog(object):
                step = 'changesets'
                count = 1
                ui = self.ui
                def __call__(self):
                    self.ui.progress(self.step, self.count, unit='chunks')
                    self.count += 1
            pr = prog()
            chunkiter = changegroup.chunkiter(source, progress=pr)
            if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
                raise util.Abort(_("received changelog group is empty"))
            clend = len(cl)
            changesets = clend - clstart
            self.ui.progress('changesets', None)

            # pull off the manifest group
            self.ui.status(_("adding manifests\n"))
            pr.step = 'manifests'
            pr.count = 1
            chunkiter = changegroup.chunkiter(source, progress=pr)
            # no need to check for empty manifest group here:
            # if the result of the merge of 1 and 2 is the same in 3 and 4,
            # no new manifest will be created and the manifest group will
            # be empty during the pull
            self.manifest.addgroup(chunkiter, revmap, trp)
            self.ui.progress('manifests', None)

            needfiles = {}
            if self.ui.configbool('server', 'validate', default=False):
                # validate incoming csets have their manifests
                for cset in xrange(clstart, clend):

                    for f, n in mfest.iteritems():
                        needfiles.setdefault(f, set()).add(n)

            # process the files
            self.ui.status(_("adding file changes\n"))
            pr.step = 'files'
            pr.count = 1
            while 1:
                f = changegroup.getchunk(source)
                if not f:
                    break
                self.ui.debug("adding %s revisions\n" % f)
                fl = self.file(f)
                o = len(fl)
                chunkiter = changegroup.chunkiter(source, progress=pr)
                if fl.addgroup(chunkiter, revmap, trp) is None:
                    raise util.Abort(_("received file revlog group is empty"))
                revisions += len(fl) - o
                files += 1
                if f in needfiles:

                        n = fl.node(new)
                        if n in needs:
                            needs.remove(n)
                    if not needs:
                        del needfiles[f]
            self.ui.progress('files', None)

            for f, needs in needfiles.iteritems():
                fl = self.file(f)
                for n in needs:
                    try: