comparison mercurial/changegroup.py @ 38980:4a202bccafcf

changegroup: factor changelogdone into an argument

The variable was basically tracking whether the current operation
is being performed against the changelog or something else. So
let's just pass such a flag to everything that needs to access it.

I'm still not a huge fan of building changelog awareness into
low-level functions like revision delta generation. But passing
an argument is strictly better than state on the packer instance.

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

38979:6d726d1b08cb

        if self._repo.ui.verbose and not self._repo.ui.debugflag:
            self._verbosenote = self._repo.ui.note
        else:
            self._verbosenote = lambda s: None

        # TODO the functionality keyed off of this should probably be
        # controlled via arguments to group() that influence behavior.
        self._changelogdone = False

        # Maps CL revs to per-revlog revisions. Cleared in close() at
        # the end of each group.
        self._clrevtolocalrev = {}
        self._nextclrevtolocalrev = {}

    def _fileheader(self, fname):
        return chunkheader(len(fname)) + fname

    # Extracted both for clarity and for overriding in extensions.
    def _sortgroup(self, store, nodelist, lookup):
        """Sort nodes for change group and turn them into revnums."""
        # Ellipses serving mode.
        #
        # In a perfect world, we'd generate better ellipsis-ified graphs
        # for non-changelog revlogs. In practice, we haven't started doing

        # The one invariant we *know* holds is that the new (potentially
        # bogus) DAG shape will be valid if we order the nodes in the
        # order that they're introduced in dramatis personae by the
        # changelog, so what we do is we sort the non-changelog histories
        # by the order in which they are used by the changelog.
        if self._ellipses and self._changelogdone:
            key = lambda n: self._clnodetorev[lookup(n)]
            return [store.rev(n) for n in sorted(nodelist, key=key)]

        # for generaldelta revlogs, we linearize the revs; this will both be
        # much quicker and generate a much smaller bundle

            dag = dagutil.revlogdag(store)
            return dag.linearize(set(store.rev(n) for n in nodelist))
        else:
            return sorted([store.rev(n) for n in nodelist])

    def group(self, nodelist, store, lookup, units=None):
        """Calculate a delta group, yielding a sequence of changegroup chunks
        (strings).

        Given a list of changeset revs, return a set of deltas and
        metadata corresponding to nodes. The first delta is

        # if we don't have any revisions touched by these changesets, bail
        if len(nodelist) == 0:
            yield self._close()
            return

        revs = self._sortgroup(store, nodelist, lookup)

        # add the parent of the first rev
        p = store.parentrevs(revs[0])[0]
        revs.insert(0, p)

        for r in pycompat.xrange(len(revs) - 1):
            if progress:
                progress.update(r + 1)
            prev, curr = revs[r], revs[r + 1]
            linknode = lookup(store.node(curr))
            for c in self._revchunk(store, curr, prev, linknode):
                yield c

        if progress:
            progress.complete()
        yield self._close()

            assert self.version == b'03'
            yield self._fileheader(dir)

        # TODO violates storage abstractions by assuming revlogs.
        dirlog = self._repo.manifestlog._revlog.dirlog(dir)
        for chunk in self.group(mfnodes, dirlog, lookuplinknode,
                                units=_('manifests')):
            yield chunk

    def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
        """Yield a sequence of changegroup byte chunks."""

        for chunk in chunks:
            size += len(chunk)
            yield chunk

        self._verbosenote(_('%8.i (changelog)\n') % size)

        self._changelogdone = True

        clrevorder = clstate['clrevorder']
        mfs = clstate['mfs']
        changedfiles = clstate['changedfiles']

            'clrevorder': clrevorder,
            'mfs': mfs,
            'changedfiles': changedfiles,
        }

        gen = self.group(nodes, cl, lookupcl, units=_('changesets'))

        return state, gen

    def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs,
                          fnodes, source):

            if filenodes:
                progress.update(i + 1, item=fname)
                h = self._fileheader(fname)
                size = len(h)
                yield h
                for chunk in self.group(filenodes, filerevlog, lookupfilelog):
                    size += len(chunk)
                    yield chunk
                self._verbosenote(_('%8.i  %s\n') % (size, fname))
        progress.complete()

    def _revchunk(self, store, rev, prev, linknode):
        if self._ellipses:
            fn = self._revisiondeltanarrow
        else:
            fn = self._revisiondeltanormal

        delta = fn(store, rev, prev, linknode)
        if not delta:
            return

        meta = self._builddeltaheader(delta)
        l = len(meta) + sum(len(x) for x in delta.deltachunks)

        yield chunkheader(l)
        yield meta
        for x in delta.deltachunks:
            yield x

    def _revisiondeltanormal(self, store, rev, prev, linknode):
        node = store.node(rev)
        p1, p2 = store.parentrevs(rev)
        base = self._deltaparentfn(store, rev, p1, p2, prev)

        prefix = ''

            linknode=linknode,
            flags=store.flags(rev),
            deltachunks=(prefix, delta),
        )

    def _revisiondeltanarrow(self, store, rev, prev, linknode):
        # build up some mapping information that's useful later. See
        # the local() nested function below.
        if not self._changelogdone:
            self._clnodetorev[linknode] = rev
            linkrev = rev
            self._clrevtolocalrev[linkrev] = rev
        else:
            linkrev = self._clnodetorev[linknode]
            self._clrevtolocalrev[linkrev] = rev

        # This is a node to send in full, because the changeset it
        # corresponds to was a full changeset.
        if linknode in self._fullnodes:
            return self._revisiondeltanormal(store, rev, prev, linknode)

        # At this point, a node can either be one we should skip or an
        # ellipsis. If it's not an ellipsis, bail immediately.
        if linkrev not in self._precomputedellipsis:
            return

            mappings as needed.
            """
            if clrev == nullrev:
                return nullrev

            if not self._changelogdone:
                # If we're doing the changelog, it's possible that we
                # have a parent that is already on the client, and we
                # need to store some extra mapping information so that
                # our contained ellipsis nodes will be able to resolve
                # their parents.

38980:4a202bccafcf

        if self._repo.ui.verbose and not self._repo.ui.debugflag:
            self._verbosenote = self._repo.ui.note
        else:
            self._verbosenote = lambda s: None

        # Maps CL revs to per-revlog revisions. Cleared in close() at
        # the end of each group.
        self._clrevtolocalrev = {}
        self._nextclrevtolocalrev = {}

    def _fileheader(self, fname):
        return chunkheader(len(fname)) + fname

    # Extracted both for clarity and for overriding in extensions.
    def _sortgroup(self, store, ischangelog, nodelist, lookup):
        """Sort nodes for change group and turn them into revnums."""
        # Ellipses serving mode.
        #
        # In a perfect world, we'd generate better ellipsis-ified graphs
        # for non-changelog revlogs. In practice, we haven't started doing

        # The one invariant we *know* holds is that the new (potentially
        # bogus) DAG shape will be valid if we order the nodes in the
        # order that they're introduced in dramatis personae by the
        # changelog, so what we do is we sort the non-changelog histories
        # by the order in which they are used by the changelog.
        if self._ellipses and not ischangelog:
            key = lambda n: self._clnodetorev[lookup(n)]
            return [store.rev(n) for n in sorted(nodelist, key=key)]

        # for generaldelta revlogs, we linearize the revs; this will both be
        # much quicker and generate a much smaller bundle

            dag = dagutil.revlogdag(store)
            return dag.linearize(set(store.rev(n) for n in nodelist))
        else:
            return sorted([store.rev(n) for n in nodelist])

    def group(self, nodelist, store, ischangelog, lookup, units=None):
        """Calculate a delta group, yielding a sequence of changegroup chunks
        (strings).

        Given a list of changeset revs, return a set of deltas and
        metadata corresponding to nodes. The first delta is

        # if we don't have any revisions touched by these changesets, bail
        if len(nodelist) == 0:
            yield self._close()
            return

        revs = self._sortgroup(store, ischangelog, nodelist, lookup)

        # add the parent of the first rev
        p = store.parentrevs(revs[0])[0]
        revs.insert(0, p)

        for r in pycompat.xrange(len(revs) - 1):
            if progress:
                progress.update(r + 1)
            prev, curr = revs[r], revs[r + 1]
            linknode = lookup(store.node(curr))
            for c in self._revchunk(store, ischangelog, curr, prev, linknode):
                yield c

        if progress:
            progress.complete()
        yield self._close()

            assert self.version == b'03'
            yield self._fileheader(dir)

        # TODO violates storage abstractions by assuming revlogs.
        dirlog = self._repo.manifestlog._revlog.dirlog(dir)
        for chunk in self.group(mfnodes, dirlog, False, lookuplinknode,
                                units=_('manifests')):
            yield chunk

    def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
        """Yield a sequence of changegroup byte chunks."""

        for chunk in chunks:
            size += len(chunk)
            yield chunk

        self._verbosenote(_('%8.i (changelog)\n') % size)

        clrevorder = clstate['clrevorder']
        mfs = clstate['mfs']
        changedfiles = clstate['changedfiles']

            'clrevorder': clrevorder,
            'mfs': mfs,
            'changedfiles': changedfiles,
        }

        gen = self.group(nodes, cl, True, lookupcl, units=_('changesets'))

        return state, gen

    def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs,
                          fnodes, source):

            if filenodes:
                progress.update(i + 1, item=fname)
                h = self._fileheader(fname)
                size = len(h)
                yield h
                for chunk in self.group(filenodes, filerevlog, False,
                                        lookupfilelog):
                    size += len(chunk)
                    yield chunk
                self._verbosenote(_('%8.i  %s\n') % (size, fname))
        progress.complete()

    def _revchunk(self, store, ischangelog, rev, prev, linknode):
        if self._ellipses:
            fn = self._revisiondeltanarrow
        else:
            fn = self._revisiondeltanormal

        delta = fn(store, ischangelog, rev, prev, linknode)
        if not delta:
            return

        meta = self._builddeltaheader(delta)
        l = len(meta) + sum(len(x) for x in delta.deltachunks)

        yield chunkheader(l)
        yield meta
        for x in delta.deltachunks:
            yield x

    def _revisiondeltanormal(self, store, ischangelog, rev, prev, linknode):
        node = store.node(rev)
        p1, p2 = store.parentrevs(rev)
        base = self._deltaparentfn(store, rev, p1, p2, prev)

        prefix = ''

            linknode=linknode,
            flags=store.flags(rev),
            deltachunks=(prefix, delta),
        )

    def _revisiondeltanarrow(self, store, ischangelog, rev, prev, linknode):
        # build up some mapping information that's useful later. See
        # the local() nested function below.
        if ischangelog:
            self._clnodetorev[linknode] = rev
            linkrev = rev
            self._clrevtolocalrev[linkrev] = rev
        else:
            linkrev = self._clnodetorev[linknode]
            self._clrevtolocalrev[linkrev] = rev

        # This is a node to send in full, because the changeset it
        # corresponds to was a full changeset.
        if linknode in self._fullnodes:
            return self._revisiondeltanormal(store, ischangelog, rev, prev,
                                             linknode)

        # At this point, a node can either be one we should skip or an
        # ellipsis. If it's not an ellipsis, bail immediately.
        if linkrev not in self._precomputedellipsis:
            return

            mappings as needed.
            """
            if clrev == nullrev:
                return nullrev

            if ischangelog:
                # If we're doing the changelog, it's possible that we
                # have a parent that is already on the client, and we
                # need to store some extra mapping information so that
                # our contained ellipsis nodes will be able to resolve
                # their parents.