comparison mercurial/revlog.py @ 45788:a5206e71c536

revlog: extend addgroup() with callback for duplicates

The addgroup() interface currently doesn't allow the caller to keep
track of duplicated nodes except by looking at the returned node list.
Add an optional second callback for this purpose and change the return
type to a boolean. This allows follow-up changes to use more efficient
storage for the node list in places that are memory-sensitive.

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

45787:225e513c444e

            ifh.write(data[0])
            ifh.write(data[1])
            self._enforceinlinesize(transaction, ifh)
        nodemaputil.setup_persistent_nodemap(transaction, self)

    def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None):
        """
        add a delta group

        given a set of deltas, add them to the revision log. the
        first delta is against its parent, which should be in our

        this revlog and the node that was added.
        """

        if self._writinghandles:
            raise error.ProgrammingError(b'cannot nest addgroup() calls')

        nodes = []

        r = len(self)
        end = 0
        if r:
            end = self.end(r - 1)

            if dfh:
                dfh.flush()
            ifh.flush()

        self._writinghandles = (ifh, dfh)

        try:
            deltacomputer = deltautil.deltacomputer(self)
            # loop through our set of deltas
            for data in deltas:
                node, p1, p2, linknode, deltabase, delta, flags = data
                link = linkmapper(linknode)
                flags = flags or REVIDX_DEFAULT_FLAGS

                nodes.append(node)

                if self.index.has_node(node):
                    self._nodeduplicatecallback(transaction, node)
                    # this can happen if two branches make the same change
                    continue

                for p in (p1, p2):
                    if not self.index.has_node(p):
                        raise error.LookupError(

                    deltacomputer=deltacomputer,
                )

                if addrevisioncb:
                    addrevisioncb(self, node)

                if not dfh and not self._inline:
                    # addrevision switched from inline to conventional
                    # reopen the index
                    ifh.close()

            self._writinghandles = None

            if dfh:
                dfh.close()
            ifh.close()

        return nodes

    def iscensored(self, rev):
        """Check if a file revision is censored."""
        if not self._censorable:
            return False

45788:a5206e71c536

            ifh.write(data[0])
            ifh.write(data[1])
            self._enforceinlinesize(transaction, ifh)
        nodemaputil.setup_persistent_nodemap(transaction, self)

    def addgroup(
        self,
        deltas,
        linkmapper,
        transaction,
        addrevisioncb=None,
        duplicaterevisioncb=None,
    ):
        """
        add a delta group

        given a set of deltas, add them to the revision log. the
        first delta is against its parent, which should be in our

        this revlog and the node that was added.
        """

        if self._writinghandles:
            raise error.ProgrammingError(b'cannot nest addgroup() calls')

        r = len(self)
        end = 0
        if r:
            end = self.end(r - 1)

            if dfh:
                dfh.flush()
            ifh.flush()

        self._writinghandles = (ifh, dfh)
        empty = True

        try:
            deltacomputer = deltautil.deltacomputer(self)
            # loop through our set of deltas
            for data in deltas:
                node, p1, p2, linknode, deltabase, delta, flags = data
                link = linkmapper(linknode)
                flags = flags or REVIDX_DEFAULT_FLAGS

                if self.index.has_node(node):
                    # this can happen if two branches make the same change
                    self._nodeduplicatecallback(transaction, node)
                    if duplicaterevisioncb:
                        duplicaterevisioncb(self, node)
                    empty = False
                    continue

                for p in (p1, p2):
                    if not self.index.has_node(p):
                        raise error.LookupError(

                    deltacomputer=deltacomputer,
                )

                if addrevisioncb:
                    addrevisioncb(self, node)
                empty = False

                if not dfh and not self._inline:
                    # addrevision switched from inline to conventional
                    # reopen the index
                    ifh.close()

            self._writinghandles = None

            if dfh:
                dfh.close()
            ifh.close()
        return not empty

    def iscensored(self, rev):
        """Check if a file revision is censored."""
        if not self._censorable:
            return False