comparison mercurial/context.py @ 44857:e607099d8b93

context: implement mergestate() method

This will let us have the mergestate storage be controlled by the context. In
particular, for working contexts we should use the existing mergestate, but
for overlay contexts it's inappropriate to drop files in .hg/merge.

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

44856:b7808443ed6a

    dagop,
    encoding,
    error,
    fileset,
    match as matchmod,
    obsolete as obsmod,
    patch,
    pathutil,
    phases,
    pycompat,

        r.unknown.sort()
        r.ignored.sort()
        r.clean.sort()

        return r


class changectx(basectx):
    """A changecontext object makes access to data related to a particular
    changeset convenient. It represents a read-only context already present in

        # from immediately doing so for subsequent changing files
        self._repo.dirstate.write(self._repo.currenttransaction())

        sparse.aftercommit(self._repo, node)


class committablefilectx(basefilectx):
    """A committablefilectx provides common functionality for a file context
    that wants the ability to commit, e.g. workingfilectx or memfilectx."""

44857:e607099d8b93

    dagop,
    encoding,
    error,
    fileset,
    match as matchmod,
    mergestate as mergestatemod,
    obsolete as obsmod,
    patch,
    pathutil,
    phases,
    pycompat,

        r.unknown.sort()
        r.ignored.sort()
        r.clean.sort()

        return r

    def mergestate(self, clean=False):
        """Get a mergestate object for this context."""
        raise NotImplementedError(
            '%s does not implement mergestate()' % self.__class__
        )


class changectx(basectx):
    """A changecontext object makes access to data related to a particular
    changeset convenient. It represents a read-only context already present in

        # from immediately doing so for subsequent changing files
        self._repo.dirstate.write(self._repo.currenttransaction())

        sparse.aftercommit(self._repo, node)

    def mergestate(self, clean=False):
        if clean:
            return mergestatemod.mergestate.clean(self._repo)
        return mergestatemod.mergestate.read(self._repo)


class committablefilectx(basefilectx):
    """A committablefilectx provides common functionality for a file context
    that wants the ability to commit, e.g. workingfilectx or memfilectx."""