comparison mercurial/cmdutil.py @ 43937:4ca89cc20d02

status: extract active-merge state for reuse

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

43936:699d6be3820a

@attr.s(frozen=True)
class morestatus(object):
    reporoot = attr.ib()
    unfinishedop = attr.ib()
    unfinishedmsg = attr.ib()
    inmergestate = attr.ib()
    unresolvedpaths = attr.ib()
    _label = b'status.morestatus'

    def formatfile(self, path, fm):
        if self.inmergestate and path in self.unresolvedpaths:
            fm.data(unresolved=True)

    def formatfooter(self, fm):
        fm.startitem()
        fm.data(

            fm.plain(
                b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
            )

    def _formatconflicts(self, fm):
        if not self.inmergestate:
            return

        if self.unresolvedpaths:
            mergeliststr = b'\n'.join(
                [

def readmorestatus(repo):
    """Returns a morestatus object if the repo has unfinished state."""
    statetuple = statemod.getrepostate(repo)
    if not statetuple:
        return None

    unfinishedop, unfinishedmsg = statetuple
    mergestate = mergemod.mergestate.read(repo)
    unresolved = None
    if mergestate.active():
        unresolved = sorted(mergestate.unresolved())
    return morestatus(
        repo.root,
        unfinishedop,
        unfinishedmsg,
        unresolved is not None,
        unresolved,
    )


def findpossible(cmd, table, strict=False):
    """

43937:4ca89cc20d02

@attr.s(frozen=True)
class morestatus(object):
    reporoot = attr.ib()
    unfinishedop = attr.ib()
    unfinishedmsg = attr.ib()
    activemerge = attr.ib()
    unresolvedpaths = attr.ib()
    _label = b'status.morestatus'

    def formatfile(self, path, fm):
        if self.activemerge and path in self.unresolvedpaths:
            fm.data(unresolved=True)

    def formatfooter(self, fm):
        fm.startitem()
        fm.data(

            fm.plain(
                b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
            )

    def _formatconflicts(self, fm):
        if not self.activemerge:
            return

        if self.unresolvedpaths:
            mergeliststr = b'\n'.join(
                [

def readmorestatus(repo):
    """Returns a morestatus object if the repo has unfinished state."""
    statetuple = statemod.getrepostate(repo)
    mergestate = mergemod.mergestate.read(repo)
    activemerge = mergestate.active()
    if not statetuple:
        return None

    unfinishedop, unfinishedmsg = statetuple
    mergestate = mergemod.mergestate.read(repo)
    unresolved = None
    if activemerge:
        unresolved = sorted(mergestate.unresolved())
    return morestatus(
        repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved
    )


def findpossible(cmd, table, strict=False):
    """