Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 43842:7315464f0613

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: add template/json data about whether a file has unresolved conflicts Differential Revision: https://phab.mercurial-scm.org/D7594
author Rodrigo Damazio Bovendorp <rdamazio@google.com>
date Mon, 09 Dec 2019 22:06:55 -0800
parents fb4a6d584756
children 612951e08278
comparison
equal deleted inserted replaced
43841:fb4a6d584756 43842:7315464f0613
785 unfinishedop = attr.ib() 785 unfinishedop = attr.ib()
786 unfinishedmsg = attr.ib() 786 unfinishedmsg = attr.ib()
787 inmergestate = attr.ib() 787 inmergestate = attr.ib()
788 unresolvedpaths = attr.ib() 788 unresolvedpaths = attr.ib()
789 _label = b'status.morestatus' 789 _label = b'status.morestatus'
790
791 def formatfile(self, path, fm):
792 if self.inmergestate and path in self.unresolvedpaths:
793 fm.data(unresolved=True)
790 794
791 def formatfooter(self, fm): 795 def formatfooter(self, fm):
792 statemsg = _(b'The repository is in an unfinished *%s* state.' 796 statemsg = _(b'The repository is in an unfinished *%s* state.'
793 ) % self.unfinishedop 797 ) % self.unfinishedop
794 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) 798 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)