Show More
@@ -832,7 +832,7 b' def _commentlines(raw):' | |||||
832 |
|
832 | |||
833 | @attr.s(frozen=True) |
|
833 | @attr.s(frozen=True) | |
834 | class morestatus: |
|
834 | class morestatus: | |
835 |
repo |
|
835 | repo = attr.ib() | |
836 | unfinishedop = attr.ib() |
|
836 | unfinishedop = attr.ib() | |
837 | unfinishedmsg = attr.ib() |
|
837 | unfinishedmsg = attr.ib() | |
838 | activemerge = attr.ib() |
|
838 | activemerge = attr.ib() | |
@@ -876,7 +876,7 b' class morestatus:' | |||||
876 | mergeliststr = b'\n'.join( |
|
876 | mergeliststr = b'\n'.join( | |
877 | [ |
|
877 | [ | |
878 | b' %s' |
|
878 | b' %s' | |
879 | % util.pathto(self.reporoot, encoding.getcwd(), path) |
|
879 | % util.pathto(self.repo.root, encoding.getcwd(), path) | |
880 | for path in self.unresolvedpaths |
|
880 | for path in self.unresolvedpaths | |
881 | ] |
|
881 | ] | |
882 | ) |
|
882 | ) | |
@@ -898,6 +898,7 b' To mark files as resolved: hg resolve -' | |||||
898 | # Already output. |
|
898 | # Already output. | |
899 | continue |
|
899 | continue | |
900 | fm.startitem() |
|
900 | fm.startitem() | |
|
901 | fm.context(repo=self.repo) | |||
901 | # We can't claim to know the status of the file - it may just |
|
902 | # We can't claim to know the status of the file - it may just | |
902 | # have been in one of the states that were not requested for |
|
903 | # have been in one of the states that were not requested for | |
903 | # display, so it could be anything. |
|
904 | # display, so it could be anything. | |
@@ -923,7 +924,7 b' def readmorestatus(repo):' | |||||
923 | if activemerge: |
|
924 | if activemerge: | |
924 | unresolved = sorted(mergestate.unresolved()) |
|
925 | unresolved = sorted(mergestate.unresolved()) | |
925 | return morestatus( |
|
926 | return morestatus( | |
926 |
repo |
|
927 | repo, unfinishedop, unfinishedmsg, activemerge, unresolved | |
927 | ) |
|
928 | ) | |
928 |
|
929 | |||
929 |
|
930 |
@@ -633,6 +633,10 b' Test that statuses are reported properly' | |||||
633 | # |
|
633 | # | |
634 | # To mark files as resolved: hg resolve --mark FILE |
|
634 | # To mark files as resolved: hg resolve --mark FILE | |
635 |
|
635 | |||
|
636 | $ hg status -T '{status} {path} - {relpath(path)}\n' | |||
|
637 | M foo - foo | |||
|
638 | a - a | |||
|
639 | ||||
636 | $ hg status -Tjson |
|
640 | $ hg status -Tjson | |
637 | [ |
|
641 | [ | |
638 | { |
|
642 | { |
General Comments 0
You need to be logged in to leave comments.
Login now