791 def formatfile(self, path, fm): |
791 def formatfile(self, path, fm): |
792 if self.inmergestate and path in self.unresolvedpaths: |
792 if self.inmergestate and path in self.unresolvedpaths: |
793 fm.data(unresolved=True) |
793 fm.data(unresolved=True) |
794 |
794 |
795 def formatfooter(self, fm): |
795 def formatfooter(self, fm): |
796 statemsg = _(b'The repository is in an unfinished *%s* state.' |
796 statemsg = ( |
797 ) % self.unfinishedop |
797 _(b'The repository is in an unfinished *%s* state.') |
|
798 % self.unfinishedop |
|
799 ) |
798 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) |
800 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) |
799 |
801 |
800 self._formatconflicts(fm) |
802 self._formatconflicts(fm) |
801 if self.unfinishedmsg: |
803 if self.unfinishedmsg: |
802 fm.plain(b'%s\n' % _commentlines(self.unfinishedmsg), |
804 fm.plain( |
803 label=self._label) |
805 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label |
|
806 ) |
804 |
807 |
805 def _formatconflicts(self, fm): |
808 def _formatconflicts(self, fm): |
806 if not self.inmergestate: |
809 if not self.inmergestate: |
807 return |
810 return |
808 |
811 |
809 if self.unresolvedpaths: |
812 if self.unresolvedpaths: |
810 mergeliststr = b'\n'.join( |
813 mergeliststr = b'\n'.join( |
811 [ |
814 [ |
812 b' %s' % util.pathto(self.reporoot, encoding.getcwd(), |
815 b' %s' |
813 path) |
816 % util.pathto(self.reporoot, encoding.getcwd(), path) |
814 for path in self.unresolvedpaths |
817 for path in self.unresolvedpaths |
815 ] |
818 ] |
816 ) |
819 ) |
817 msg = ( |
820 msg = ( |
818 _( |
821 _( |
839 unfinishedop, unfinishedmsg = statetuple |
842 unfinishedop, unfinishedmsg = statetuple |
840 mergestate = mergemod.mergestate.read(repo) |
843 mergestate = mergemod.mergestate.read(repo) |
841 unresolved = None |
844 unresolved = None |
842 if mergestate.active(): |
845 if mergestate.active(): |
843 unresolved = sorted(mergestate.unresolved()) |
846 unresolved = sorted(mergestate.unresolved()) |
844 return morestatus(repo.root, unfinishedop, unfinishedmsg, |
847 return morestatus( |
845 unresolved is not None, unresolved) |
848 repo.root, |
|
849 unfinishedop, |
|
850 unfinishedmsg, |
|
851 unresolved is not None, |
|
852 unresolved, |
|
853 ) |
846 |
854 |
847 |
855 |
848 def findpossible(cmd, table, strict=False): |
856 def findpossible(cmd, table, strict=False): |
849 """ |
857 """ |
850 Return cmd -> (aliases, command table entry) |
858 Return cmd -> (aliases, command table entry) |