equal
deleted
inserted
replaced
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) |