mercurial/cmdutil.py

43871:5e0f6451e2d2

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

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

43872:aac921f54554

    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(
            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)