Show More
| @@ -70,7 +70,7 b' def getprettygraphnode(orig, *args, **kw' | |||
|
|
70 | 70 | if node == b'o': |
|
|
71 | 71 | return b'\xE2\x97\x8B' # U+25CB ○ |
|
|
72 | 72 | if node == b'@': |
|
|
73 |
return b'\xE2\x97\x8 |
|
|
|
73 | return b'\xE2\x97\x89' # U+25C9 ◉ | |
|
|
74 | 74 | if node == b'%': |
|
|
75 | 75 | return b'\xE2\x97\x8D' # U+25CE ◎ |
|
|
76 | 76 | if node == b'*': |
| @@ -286,7 +286,7 b" The extension should not turn on if we'r" | |||
|
|
286 | 286 | The rest of our tests will use the default narrow text UTF-8. |
|
|
287 | 287 | |
|
|
288 | 288 | $ hg log -G -q |
|
|
289 |
\xe2\x97\x8 |
|
|
|
289 | \xe2\x97\x89 34:fea3ac5810e0 (esc) | |
|
|
290 | 290 | \xe2\x94\x82 (esc) |
|
|
291 | 291 | \xe2\x94\x82 \xe2\x97\x8b 33:68608f5145f9 (esc) |
|
|
292 | 292 | \xe2\x94\x82 \xe2\x94\x82 (esc) |
| @@ -358,7 +358,7 b' The rest of our tests will use the defau' | |||
|
|
358 | 358 | |
|
|
359 | 359 | |
|
|
360 | 360 | $ hg log -G |
|
|
361 |
\xe2\x97\x8 |
|
|
|
361 | \xe2\x97\x89 changeset: 34:fea3ac5810e0 (esc) | |
|
|
362 | 362 | \xe2\x94\x82 tag: tip (esc) |
|
|
363 | 363 | \xe2\x94\x82 parent: 32:d06dffa21a31 (esc) |
|
|
364 | 364 | \xe2\x94\x82 user: test (esc) |
| @@ -594,7 +594,7 b' The rest of our tests will use the defau' | |||
|
|
594 | 594 | |
|
|
595 | 595 | File glog: |
|
|
596 | 596 | $ hg log -G a |
|
|
597 |
\xe2\x97\x8 |
|
|
|
597 | \xe2\x97\x89 changeset: 34:fea3ac5810e0 (esc) | |
|
|
598 | 598 | \xe2\x94\x82 tag: tip (esc) |
|
|
599 | 599 | \xe2\x94\x82 parent: 32:d06dffa21a31 (esc) |
|
|
600 | 600 | \xe2\x94\x82 user: test (esc) |
| @@ -831,7 +831,7 b' File glog:' | |||
|
|
831 | 831 | File glog per revset: |
|
|
832 | 832 | |
|
|
833 | 833 | $ hg log -G -r 'file("a")' |
|
|
834 |
\xe2\x97\x8 |
|
|
|
834 | \xe2\x97\x89 changeset: 34:fea3ac5810e0 (esc) | |
|
|
835 | 835 | \xe2\x94\x82 tag: tip (esc) |
|
|
836 | 836 | \xe2\x94\x82 parent: 32:d06dffa21a31 (esc) |
|
|
837 | 837 | \xe2\x94\x82 user: test (esc) |
| @@ -1268,7 +1268,7 b' Empty revision range - display nothing:' | |||
|
|
1268 | 1268 | |
|
|
1269 | 1269 | From outer space: |
|
|
1270 | 1270 | $ hg log -G -l1 repo |
|
|
1271 |
\xe2\x97\x8 |
|
|
|
1271 | \xe2\x97\x89 changeset: 34:fea3ac5810e0 (esc) | |
|
|
1272 | 1272 | \xe2\x94\x82 tag: tip (esc) |
|
|
1273 | 1273 | \xe2\x95\xa7 parent: 32:d06dffa21a31 (esc) |
|
|
1274 | 1274 | user: test |
| @@ -1276,7 +1276,7 b' From outer space:' | |||
|
|
1276 | 1276 | summary: (34) head |
|
|
1277 | 1277 | |
|
|
1278 | 1278 | $ hg log -G -l1 repo/a |
|
|
1279 |
\xe2\x97\x8 |
|
|
|
1279 | \xe2\x97\x89 changeset: 34:fea3ac5810e0 (esc) | |
|
|
1280 | 1280 | \xe2\x94\x82 tag: tip (esc) |
|
|
1281 | 1281 | \xe2\x95\xa7 parent: 32:d06dffa21a31 (esc) |
|
|
1282 | 1282 | user: test |
| @@ -1299,7 +1299,7 b' File log with revs != cset revs:' | |||
|
|
1299 | 1299 | $ echo more >two |
|
|
1300 | 1300 | $ hg commit -mmore |
|
|
1301 | 1301 | $ hg log -G two |
|
|
1302 |
\xe2\x97\x8 |
|
|
|
1302 | \xe2\x97\x89 changeset: 2:12c28321755b (esc) | |
|
|
1303 | 1303 | \xe2\x94\x82 tag: tip (esc) |
|
|
1304 | 1304 | \xe2\x94\x82 user: test (esc) |
|
|
1305 | 1305 | \xe2\x94\x82 date: Thu Jan 01 00:00:00 1970 +0000 (esc) |
| @@ -1375,7 +1375,7 b' Incoming and outgoing:' | |||
|
|
1375 | 1375 | $ hg -R repo outgoing --graph repo2 |
|
|
1376 | 1376 | comparing with repo2 |
|
|
1377 | 1377 | searching for changes |
|
|
1378 |
\xe2\x97\x8 |
|
|
|
1378 | \xe2\x97\x89 changeset: 34:fea3ac5810e0 (esc) | |
|
|
1379 | 1379 | \xe2\x94\x82 tag: tip (esc) |
|
|
1380 | 1380 | \xe2\x94\x82 parent: 32:d06dffa21a31 (esc) |
|
|
1381 | 1381 | \xe2\x94\x82 user: test (esc) |
| @@ -1518,7 +1518,7 b' Do not crash or produce strange graphs i' | |||
|
|
1518 | 1518 | (branches are permanent and global, did you want a bookmark?) |
|
|
1519 | 1519 | $ commit 36 "buggy merge: identical parents" 35 35 |
|
|
1520 | 1520 | $ hg log -G -l5 |
|
|
1521 |
\xe2\x97\x8 |
|
|
|
1521 | \xe2\x97\x89 changeset: 36:08a19a744424 (esc) | |
|
|
1522 | 1522 | \xe2\x94\x82 branch: branch (esc) |
|
|
1523 | 1523 | \xe2\x94\x82 tag: tip (esc) |
|
|
1524 | 1524 | \xe2\x94\x82 parent: 35:9159c3644c5e (esc) |
| @@ -1739,7 +1739,7 b' have 2 filelog topological heads in a li' | |||
|
|
1739 | 1739 | $ hg mv dir/b e |
|
|
1740 | 1740 | $ hg ci -m "mv dir/b e" |
|
|
1741 | 1741 | $ hg log -G --template '({rev}) {desc|firstline}\n' |
|
|
1742 |
\xe2\x97\x8 |
|
|
|
1742 | \xe2\x97\x89 (4) mv dir/b e (esc) | |
|
|
1743 | 1743 | \xe2\x94\x82 (esc) |
|
|
1744 | 1744 | \xe2\x97\x8b (3) mv a b; add d (esc) |
|
|
1745 | 1745 | \xe2\x94\x82 (esc) |
| @@ -1948,7 +1948,7 b' Cannot compare with log --follow-first F' | |||
|
|
1948 | 1948 | [] |
|
|
1949 | 1949 | <generatorsetdesc-> |
|
|
1950 | 1950 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
|
|
1951 |
\xe2\x97\x8 |
|
|
|
1951 | \xe2\x97\x89 6 merge 5 and 4 (esc) | |
|
|
1952 | 1952 | \xe2\x94\x82\xe2\x95\xb2 (esc) |
|
|
1953 | 1953 | \xe2\x94\x82 \xe2\x95\xa7 (esc) |
|
|
1954 | 1954 | \xe2\x97\x8b 5 add another e (esc) |
| @@ -1959,7 +1959,7 b' Test --copies' | |||
|
|
1959 | 1959 | |
|
|
1960 | 1960 | $ hg log -G --copies --template "{rev} {desc|firstline} \ |
|
|
1961 | 1961 | > copies: {file_copies_switch}\n" |
|
|
1962 |
\xe2\x97\x8 |
|
|
|
1962 | \xe2\x97\x89 6 merge 5 and 4 copies: (esc) | |
|
|
1963 | 1963 | \xe2\x94\x82\xe2\x95\xb2 (esc) |
|
|
1964 | 1964 | \xe2\x94\x82 \xe2\x97\x8b 5 add another e copies: (esc) |
|
|
1965 | 1965 | \xe2\x94\x82 \xe2\x94\x82 (esc) |
| @@ -2101,7 +2101,7 b' Test --patch and --stat with --follow an' | |||
|
|
2101 | 2101 | |
|
|
2102 | 2102 | $ hg up -q 6 |
|
|
2103 | 2103 | $ hg log -G --git --patch --follow-first e |
|
|
2104 |
\xe2\x97\x8 |
|
|
|
2104 | \xe2\x97\x89 changeset: 6:9feeac35a70a (esc) | |
|
|
2105 | 2105 | \xe2\x94\x82\xe2\x95\xb2 tag: tip (esc) |
|
|
2106 | 2106 | \xe2\x94\x82 \xe2\x95\xa7 parent: 5:99b31f1c2782 (esc) |
|
|
2107 | 2107 | \xe2\x94\x82 parent: 4:17d952250a9d (esc) |
| @@ -2158,7 +2158,7 b' Test --follow and forward --rev' | |||
|
|
2158 | 2158 | \xe2\x94\x82\xe2\x95\xb1 (esc) |
|
|
2159 | 2159 | \xe2\x97\x8b 3 mv a b; add d (esc) |
|
|
2160 | 2160 | \xe2\x94\x82 (esc) |
|
|
2161 |
\xe2\x97\x8 |
|
|
|
2161 | \xe2\x97\x89 2 mv b dir/b (esc) | |
|
|
2162 | 2162 | \xe2\x94\x82 (esc) |
|
|
2163 | 2163 | \xe2\x97\x8b 1 copy a b (esc) |
|
|
2164 | 2164 | \xe2\x94\x82 (esc) |
| @@ -2445,7 +2445,7 b' Test --hidden' | |||
|
|
2445 | 2445 | \xe2\x94\x82 \xe2\x94\x82 (esc) |
|
|
2446 | 2446 | \xe2\x97\x8b \xe2\x94\x82 4 mv dir/b e (esc) |
|
|
2447 | 2447 | \xe2\x94\x82\xe2\x95\xb1 (esc) |
|
|
2448 |
\xe2\x97\x8 |
|
|
|
2448 | \xe2\x97\x89 3 mv a b; add d (esc) | |
|
|
2449 | 2449 | \xe2\x94\x82 (esc) |
|
|
2450 | 2450 | \xe2\x97\x8b 2 mv b dir/b (esc) |
|
|
2451 | 2451 | \xe2\x94\x82 (esc) |
| @@ -2528,7 +2528,7 b' working-directory revision' | |||
|
|
2528 | 2528 | $ hg log -G -qr '. + wdir()' |
|
|
2529 | 2529 | \xe2\x97\x8b 2147483647:ffffffffffff (esc) |
|
|
2530 | 2530 | \xe2\x94\x82 (esc) |
|
|
2531 |
\xe2\x97\x8 |
|
|
|
2531 | \xe2\x97\x89 3:5918b8d165d1 (esc) | |
|
|
2532 | 2532 | \xe2\x94\x82 (esc) |
|
|
2533 | 2533 | \xe2\x95\xa7 (esc) |
|
|
2534 | 2534 | |
| @@ -2776,7 +2776,7 b' Setting HGPLAIN ignores graphmod styling' | |||
|
|
2776 | 2776 | .. unless HGPLAINEXCEPT=graph is set: |
|
|
2777 | 2777 | |
|
|
2778 | 2778 | $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m |
|
|
2779 |
\xe2\x97\x8 |
|
|
|
2779 | \xe2\x97\x89 changeset: 36:08a19a744424 (esc) | |
|
|
2780 | 2780 | \xe2\x94\x86 branch: branch (esc) |
|
|
2781 | 2781 | \xe2\x94\x86 tag: tip (esc) |
|
|
2782 | 2782 | \xe2\x94\x86 parent: 35:9159c3644c5e (esc) |
| @@ -3051,7 +3051,7 b' the right node styles are used (issue517' | |||
|
|
3051 | 3051 | (branch merge, don't forget to commit) |
|
|
3052 | 3052 | $ hg ci -qm 6 |
|
|
3053 | 3053 | $ hg log -G -r '0 | 1 | 2 | 6' |
|
|
3054 |
\xe2\x97\x8 |
|
|
|
3054 | \xe2\x97\x89 changeset: 6:851fe89689ad (esc) | |
|
|
3055 | 3055 | \xe2\x94\x86\xe2\x95\xb2 tag: tip (esc) |
|
|
3056 | 3056 | \xe2\x94\x86 \xe2\x94\x86 parent: 5:4f1e3cf15f5d (esc) |
|
|
3057 | 3057 | \xe2\x94\x86 \xe2\x94\x86 parent: 3:b74ba7084d2d (esc) |
| @@ -3095,7 +3095,7 b' Multiple roots (issue5440):' | |||
|
|
3095 | 3095 | $ hg ci -Aqm bar |
|
|
3096 | 3096 | |
|
|
3097 | 3097 | $ hg log -Gr null: |
|
|
3098 |
\xe2\x97\x8 |
|
|
|
3098 | \xe2\x97\x89 1 bar (esc) | |
|
|
3099 | 3099 | \xe2\x94\x82 (esc) |
|
|
3100 | 3100 | \xe2\x94\x82 \xe2\x97\x8b 0 foo (esc) |
|
|
3101 | 3101 | \xe2\x94\x82\xe2\x95\xb1 (esc) |
| @@ -3107,7 +3107,7 b' Multiple roots (issue5440):' | |||
|
|
3107 | 3107 | \xe2\x97\x8b -1 (esc) |
|
|
3108 | 3108 | |
|
|
3109 | 3109 | $ hg log -Gr null+1 |
|
|
3110 |
\xe2\x97\x8 |
|
|
|
3110 | \xe2\x97\x89 1 bar (esc) | |
|
|
3111 | 3111 | \xe2\x94\x82 (esc) |
|
|
3112 | 3112 | \xe2\x97\x8b -1 (esc) |
|
|
3113 | 3113 | |
General Comments 0
You need to be logged in to leave comments.
Login now