Show More
@@ -1121,7 +1121,8 b' class basefilectx(object):' | |||
|
1121 | 1121 | hist[f] = curr |
|
1122 | 1122 | del pcache[f] |
|
1123 | 1123 | |
|
1124 | return pycompat.ziplist(hist[base][0], hist[base][1].splitlines(True)) | |
|
1124 | lineattrs, text = hist[base] | |
|
1125 | return pycompat.ziplist(lineattrs, mdiff.splitnewlines(text)) | |
|
1125 | 1126 | |
|
1126 | 1127 | def ancestors(self, followfirst=False): |
|
1127 | 1128 | visit = {} |
@@ -895,6 +895,38 b' Annotate with --ignore-blank-lines (simi' | |||
|
895 | 895 | |
|
896 | 896 | $ cd .. |
|
897 | 897 | |
|
898 | Annotate with orphaned CR (issue5798) | |
|
899 | ------------------------------------- | |
|
900 | ||
|
901 | $ hg init repo-cr | |
|
902 | $ cd repo-cr | |
|
903 | ||
|
904 | $ substcr() { | |
|
905 | > sed 's/\r/[CR]/g' | |
|
906 | > } | |
|
907 | ||
|
908 | >>> with open('a', 'wb') as f: | |
|
909 | ... f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') | |
|
910 | $ hg ci -qAm0 | |
|
911 | >>> with open('a', 'wb') as f: | |
|
912 | ... f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') | |
|
913 | $ hg ci -m1 | |
|
914 | ||
|
915 | $ hg annotate -r0 a | substcr | |
|
916 | 0: 0a[CR]0b[CR] | |
|
917 | 0: 0c[CR]0d[CR] | |
|
918 | 0: 0e | |
|
919 | 0: 0f | |
|
920 | 0: 0g | |
|
921 | $ hg annotate -r1 a | substcr | |
|
922 | 0: 0a[CR]0b[CR] | |
|
923 | 1: 1c[CR]1d[CR] | |
|
924 | 0: 0e | |
|
925 | 1: 1f | |
|
926 | 0: 0g | |
|
927 | ||
|
928 | $ cd .. | |
|
929 | ||
|
898 | 930 | Annotate with linkrev pointing to another branch |
|
899 | 931 | ------------------------------------------------ |
|
900 | 932 |
General Comments 0
You need to be logged in to leave comments.
Login now