816 def formatfile(self, path, fm): |
816 def formatfile(self, path, fm): |
817 if self.activemerge and path in self.unresolvedpaths: |
817 if self.activemerge and path in self.unresolvedpaths: |
818 fm.data(unresolved=True) |
818 fm.data(unresolved=True) |
819 |
819 |
820 def formatfooter(self, fm): |
820 def formatfooter(self, fm): |
821 fm.startitem() |
821 if self.unfinishedop or self.unfinishedmsg: |
822 fm.data( |
822 fm.startitem() |
823 itemtype=b'morestatus', |
823 fm.data(itemtype=b'morestatus') |
824 unfinished=self.unfinishedop, |
824 |
825 unfinishedmsg=self.unfinishedmsg, |
825 if self.unfinishedop: |
826 ) |
826 fm.data(unfinished=self.unfinishedop) |
827 |
827 statemsg = ( |
828 statemsg = ( |
828 _(b'The repository is in an unfinished *%s* state.') |
829 _(b'The repository is in an unfinished *%s* state.') |
829 % self.unfinishedop |
830 % self.unfinishedop |
830 ) |
831 ) |
831 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) |
832 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) |
832 if self.unfinishedmsg: |
|
833 fm.data(unfinishedmsg=self.unfinishedmsg) |
833 |
834 |
834 self._formatconflicts(fm) |
835 self._formatconflicts(fm) |
|
836 |
835 if self.unfinishedmsg: |
837 if self.unfinishedmsg: |
836 fm.plain( |
838 fm.plain( |
837 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label |
839 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label |
838 ) |
840 ) |
839 |
841 |
868 def readmorestatus(repo): |
870 def readmorestatus(repo): |
869 """Returns a morestatus object if the repo has unfinished state.""" |
871 """Returns a morestatus object if the repo has unfinished state.""" |
870 statetuple = statemod.getrepostate(repo) |
872 statetuple = statemod.getrepostate(repo) |
871 mergestate = mergemod.mergestate.read(repo) |
873 mergestate = mergemod.mergestate.read(repo) |
872 activemerge = mergestate.active() |
874 activemerge = mergestate.active() |
873 if not statetuple: |
875 if not statetuple and not activemerge: |
874 return None |
876 return None |
875 |
877 |
876 unfinishedop, unfinishedmsg = statetuple |
878 unfinishedop = unfinishedmsg = unresolved = None |
877 mergestate = mergemod.mergestate.read(repo) |
879 if statetuple: |
878 unresolved = None |
880 unfinishedop, unfinishedmsg = statetuple |
879 if activemerge: |
881 if activemerge: |
880 unresolved = sorted(mergestate.unresolved()) |
882 unresolved = sorted(mergestate.unresolved()) |
881 return morestatus( |
883 return morestatus( |
882 repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved |
884 repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved |
883 ) |
885 ) |