comparison mercurial/cmdutil.py @ 43938:489fdf27769c

status: make morestatus call out unresolved conflicts after update

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

43937:4ca89cc20d02

    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(
            itemtype=b'morestatus',
            unfinished=self.unfinishedop,
            unfinishedmsg=self.unfinishedmsg,
        )

        statemsg = (
            _(b'The repository is in an unfinished *%s* state.')
            % self.unfinishedop
        )
        fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)

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

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
    )

43938:489fdf27769c

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

    def formatfooter(self, fm):
        if self.unfinishedop or self.unfinishedmsg:
            fm.startitem()
            fm.data(itemtype=b'morestatus')

        if self.unfinishedop:
            fm.data(unfinished=self.unfinishedop)
            statemsg = (
                _(b'The repository is in an unfinished *%s* state.')
                % self.unfinishedop
            )
            fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
        if self.unfinishedmsg:
            fm.data(unfinishedmsg=self.unfinishedmsg)

        self._formatconflicts(fm)

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

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 and not activemerge:
        return None

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