Show More
@@ -818,20 +818,22 b' class morestatus(object):' | |||
|
818 | 818 | fm.data(unresolved=True) |
|
819 | 819 | |
|
820 | 820 | def formatfooter(self, fm): |
|
821 | fm.startitem() | |
|
822 |
fm. |
|
|
823 |
itemtype=b'morestatus' |
|
|
824 | unfinished=self.unfinishedop, | |
|
825 |
|
|
|
826 | ) | |
|
827 | ||
|
828 | statemsg = ( | |
|
829 | _(b'The repository is in an unfinished *%s* state.') | |
|
830 | % self.unfinishedop | |
|
831 | ) | |
|
832 | fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) | |
|
821 | if self.unfinishedop or self.unfinishedmsg: | |
|
822 | fm.startitem() | |
|
823 | fm.data(itemtype=b'morestatus') | |
|
824 | ||
|
825 | if self.unfinishedop: | |
|
826 | fm.data(unfinished=self.unfinishedop) | |
|
827 | statemsg = ( | |
|
828 | _(b'The repository is in an unfinished *%s* state.') | |
|
829 | % self.unfinishedop | |
|
830 | ) | |
|
831 | fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) | |
|
832 | if self.unfinishedmsg: | |
|
833 | fm.data(unfinishedmsg=self.unfinishedmsg) | |
|
833 | 834 | |
|
834 | 835 | self._formatconflicts(fm) |
|
836 | ||
|
835 | 837 | if self.unfinishedmsg: |
|
836 | 838 | fm.plain( |
|
837 | 839 | b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label |
@@ -870,12 +872,12 b' def readmorestatus(repo):' | |||
|
870 | 872 | statetuple = statemod.getrepostate(repo) |
|
871 | 873 | mergestate = mergemod.mergestate.read(repo) |
|
872 | 874 | activemerge = mergestate.active() |
|
873 | if not statetuple: | |
|
875 | if not statetuple and not activemerge: | |
|
874 | 876 | return None |
|
875 | 877 | |
|
876 |
unfinishedop |
|
|
877 | mergestate = mergemod.mergestate.read(repo) | |
|
878 | unresolved = None | |
|
878 | unfinishedop = unfinishedmsg = unresolved = None | |
|
879 | if statetuple: | |
|
880 | unfinishedop, unfinishedmsg = statetuple | |
|
879 | 881 | if activemerge: |
|
880 | 882 | unresolved = sorted(mergestate.unresolved()) |
|
881 | 883 | return morestatus( |
@@ -252,6 +252,12 b' Cases are run as shown in that table, ro' | |||
|
252 | 252 | $ hg st |
|
253 | 253 | M a |
|
254 | 254 | ? a.orig |
|
255 | # Unresolved merge conflicts: | |
|
256 | # | |
|
257 | # a | |
|
258 | # | |
|
259 | # To mark files as resolved: hg resolve --mark FILE | |
|
260 | ||
|
255 | 261 | $ cat a |
|
256 | 262 | <<<<<<< working copy: 6efa171f091b - test: 3 |
|
257 | 263 | three |
@@ -315,6 +321,12 b' File conflict is not allowed' | |||
|
315 | 321 | $ rm a.orig |
|
316 | 322 | $ hg status |
|
317 | 323 | M a |
|
324 | # Unresolved merge conflicts: | |
|
325 | # | |
|
326 | # a | |
|
327 | # | |
|
328 | # To mark files as resolved: hg resolve --mark FILE | |
|
329 | ||
|
318 | 330 | $ hg resolve -l |
|
319 | 331 | U a |
|
320 | 332 | |
@@ -553,6 +565,12 b' Test that statuses are reported properly' | |||
|
553 | 565 | $ hg status |
|
554 | 566 | M a |
|
555 | 567 | M foo |
|
568 | # Unresolved merge conflicts: | |
|
569 | # | |
|
570 | # a | |
|
571 | # | |
|
572 | # To mark files as resolved: hg resolve --mark FILE | |
|
573 | ||
|
556 | 574 | |
|
557 | 575 | $ hg revert -r . a |
|
558 | 576 | |
@@ -561,6 +579,12 b' Test that statuses are reported properly' | |||
|
561 | 579 | U a |
|
562 | 580 | $ hg status |
|
563 | 581 | M foo |
|
582 | # Unresolved merge conflicts: | |
|
583 | # | |
|
584 | # a | |
|
585 | # | |
|
586 | # To mark files as resolved: hg resolve --mark FILE | |
|
587 | ||
|
564 | 588 | $ hg status -Tjson |
|
565 | 589 | [ |
|
566 | 590 | { |
@@ -577,6 +601,8 b' Test that statuses are reported properly' | |||
|
577 | 601 | R a |
|
578 | 602 | $ hg status |
|
579 | 603 | M foo |
|
604 | # No unresolved merge conflicts. | |
|
605 | ||
|
580 | 606 | $ hg status -Tjson |
|
581 | 607 | [ |
|
582 | 608 | { |
@@ -589,6 +615,8 b' Test that statuses are reported properly' | |||
|
589 | 615 | Test that 4 is detected as the no-argument destination from 3 and also moves |
|
590 | 616 | the bookmark with it |
|
591 | 617 | $ hg up --quiet 0 # we should be able to update to 3 directly |
|
618 | $ hg status | |
|
619 | M foo | |
|
592 | 620 | $ hg up --quiet --hidden 3 # but not implemented yet. |
|
593 | 621 | updated to hidden changeset 6efa171f091b |
|
594 | 622 | (hidden revision '6efa171f091b' was rewritten as: d047485b3896) |
General Comments 0
You need to be logged in to leave comments.
Login now