Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 3564:589649021ea1
fold: include "operation" metadata in obsmarkers
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:50:59 -0700 |
| parents | d166b3dc5e8a |
| children | e6bea259c227 |
comparison
equal
deleted
inserted
replaced
| 3563:d4c457c1ae0d | 3564:589649021ea1 |
|---|---|
| 830 | summary: C0 | 830 | summary: C0 |
| 831 | | 831 | |
| 832 | x changeset: 2:0dec01379d3b | 832 | x changeset: 2:0dec01379d3b |
| 833 | | user: test | 833 | | user: test |
| 834 | | date: Thu Jan 01 00:00:00 1970 +0000 | 834 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 835 | | obsolete: rewritten as 3:eb5a0daa2192 | 835 | | obsolete: rewritten using fold as 3:eb5a0daa2192 |
| 836 | | summary: B0 | 836 | | summary: B0 |
| 837 | | | 837 | | |
| 838 | x changeset: 1:471f378eab4c | 838 | x changeset: 1:471f378eab4c |
| 839 |/ user: test | 839 |/ user: test |
| 840 | date: Thu Jan 01 00:00:00 1970 +0000 | 840 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 841 | obsolete: rewritten as 3:eb5a0daa2192 | 841 | obsolete: rewritten using fold as 3:eb5a0daa2192 |
| 842 | summary: A0 | 842 | summary: A0 |
| 843 | | 843 | |
| 844 o changeset: 0:ea207398892e | 844 o changeset: 0:ea207398892e |
| 845 user: test | 845 user: test |
| 846 date: Thu Jan 01 00:00:00 1970 +0000 | 846 date: Thu Jan 01 00:00:00 1970 +0000 |
| 851 | 851 |
| 852 Check that debugobshistory on the first folded revision show only | 852 Check that debugobshistory on the first folded revision show only |
| 853 the revision with the target | 853 the revision with the target |
| 854 $ hg obslog --hidden 471f378eab4c --patch | 854 $ hg obslog --hidden 471f378eab4c --patch |
| 855 x 471f378eab4c (1) A0 | 855 x 471f378eab4c (1) A0 |
| 856 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 856 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 857 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 857 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 858 --- a/changeset-description | 858 --- a/changeset-description |
| 859 +++ b/changeset-description | 859 +++ b/changeset-description |
| 860 @@ -1,1 +1,1 @@ | 860 @@ -1,1 +1,1 @@ |
| 861 -A0 | 861 -A0 |
| 871 Check that with all option, all changesets are shown | 871 Check that with all option, all changesets are shown |
| 872 $ hg obslog --hidden --all 471f378eab4c --patch | 872 $ hg obslog --hidden --all 471f378eab4c --patch |
| 873 @ eb5a0daa2192 (3) C0 | 873 @ eb5a0daa2192 (3) C0 |
| 874 |\ | 874 |\ |
| 875 x | 0dec01379d3b (2) B0 | 875 x | 0dec01379d3b (2) B0 |
| 876 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 876 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 877 | (No patch available, changesets rebased) | 877 | (No patch available, changesets rebased) |
| 878 | | 878 | |
| 879 x 471f378eab4c (1) A0 | 879 x 471f378eab4c (1) A0 |
| 880 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 880 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 881 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 881 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 882 --- a/changeset-description | 882 --- a/changeset-description |
| 883 +++ b/changeset-description | 883 +++ b/changeset-description |
| 884 @@ -1,1 +1,1 @@ | 884 @@ -1,1 +1,1 @@ |
| 885 -A0 | 885 -A0 |
| 894 | 894 |
| 895 Check that debugobshistory on the second folded revision show only | 895 Check that debugobshistory on the second folded revision show only |
| 896 the revision with the target | 896 the revision with the target |
| 897 $ hg obslog --hidden 0dec01379d3b --patch | 897 $ hg obslog --hidden 0dec01379d3b --patch |
| 898 x 0dec01379d3b (2) B0 | 898 x 0dec01379d3b (2) B0 |
| 899 rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 899 rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 900 (No patch available, changesets rebased) | 900 (No patch available, changesets rebased) |
| 901 | 901 |
| 902 Check that with all option, all changesets are shown | 902 Check that with all option, all changesets are shown |
| 903 $ hg obslog --hidden --all 0dec01379d3b --patch | 903 $ hg obslog --hidden --all 0dec01379d3b --patch |
| 904 @ eb5a0daa2192 (3) C0 | 904 @ eb5a0daa2192 (3) C0 |
| 905 |\ | 905 |\ |
| 906 x | 0dec01379d3b (2) B0 | 906 x | 0dec01379d3b (2) B0 |
| 907 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 907 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 908 | (No patch available, changesets rebased) | 908 | (No patch available, changesets rebased) |
| 909 | | 909 | |
| 910 x 471f378eab4c (1) A0 | 910 x 471f378eab4c (1) A0 |
| 911 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 911 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 912 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 912 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 913 --- a/changeset-description | 913 --- a/changeset-description |
| 914 +++ b/changeset-description | 914 +++ b/changeset-description |
| 915 @@ -1,1 +1,1 @@ | 915 @@ -1,1 +1,1 @@ |
| 916 -A0 | 916 -A0 |
| 927 graph | 927 graph |
| 928 $ hg obslog eb5a0daa2192 --patch | 928 $ hg obslog eb5a0daa2192 --patch |
| 929 @ eb5a0daa2192 (3) C0 | 929 @ eb5a0daa2192 (3) C0 |
| 930 |\ | 930 |\ |
| 931 x | 0dec01379d3b (2) B0 | 931 x | 0dec01379d3b (2) B0 |
| 932 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 932 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 933 | (No patch available, changesets rebased) | 933 | (No patch available, changesets rebased) |
| 934 | | 934 | |
| 935 x 471f378eab4c (1) A0 | 935 x 471f378eab4c (1) A0 |
| 936 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 936 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 937 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 937 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 938 --- a/changeset-description | 938 --- a/changeset-description |
| 939 +++ b/changeset-description | 939 +++ b/changeset-description |
| 940 @@ -1,1 +1,1 @@ | 940 @@ -1,1 +1,1 @@ |
| 941 -A0 | 941 -A0 |
| 965 ], | 965 ], |
| 966 "effect": [ | 966 "effect": [ |
| 967 "description", | 967 "description", |
| 968 "content" | 968 "content" |
| 969 ], | 969 ], |
| 970 "operation": "fold", | |
| 970 "succnodes": [ | 971 "succnodes": [ |
| 971 "eb5a0daa2192" | 972 "eb5a0daa2192" |
| 972 ], | 973 ], |
| 973 "user": "test", | 974 "user": "test", |
| 974 "verb": "rewritten" | 975 "verb": "rewritten" |
| 988 "effect": [ | 989 "effect": [ |
| 989 "description", | 990 "description", |
| 990 "parent", | 991 "parent", |
| 991 "content" | 992 "content" |
| 992 ], | 993 ], |
| 994 "operation": "fold", | |
| 993 "succnodes": [ | 995 "succnodes": [ |
| 994 "eb5a0daa2192" | 996 "eb5a0daa2192" |
| 995 ], | 997 ], |
| 996 "user": "test", | 998 "user": "test", |
| 997 "verb": "rewritten" | 999 "verb": "rewritten" |
| 1409 | | 1411 | |
| 1410 | x changeset: 3:b7ea6d14e664 | 1412 | x changeset: 3:b7ea6d14e664 |
| 1411 | | parent: 1:471f378eab4c | 1413 | | parent: 1:471f378eab4c |
| 1412 | | user: test | 1414 | | user: test |
| 1413 | | date: Thu Jan 01 00:00:00 1970 +0000 | 1415 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1414 | | obsolete: rewritten as 4:eb5a0daa2192 | 1416 | | obsolete: rewritten using fold as 4:eb5a0daa2192 |
| 1415 | | summary: B1 | 1417 | | summary: B1 |
| 1416 | | | 1418 | | |
| 1417 | | x changeset: 2:0dec01379d3b | 1419 | | x changeset: 2:0dec01379d3b |
| 1418 | |/ user: test | 1420 | |/ user: test |
| 1419 | | date: Thu Jan 01 00:00:00 1970 +0000 | 1421 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1421 | | summary: B0 | 1423 | | summary: B0 |
| 1422 | | | 1424 | | |
| 1423 | x changeset: 1:471f378eab4c | 1425 | x changeset: 1:471f378eab4c |
| 1424 |/ user: test | 1426 |/ user: test |
| 1425 | date: Thu Jan 01 00:00:00 1970 +0000 | 1427 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1426 | obsolete: rewritten as 4:eb5a0daa2192 | 1428 | obsolete: rewritten using fold as 4:eb5a0daa2192 |
| 1427 | summary: A0 | 1429 | summary: A0 |
| 1428 | | 1430 | |
| 1429 o changeset: 0:ea207398892e | 1431 o changeset: 0:ea207398892e |
| 1430 user: test | 1432 user: test |
| 1431 date: Thu Jan 01 00:00:00 1970 +0000 | 1433 date: Thu Jan 01 00:00:00 1970 +0000 |
| 1437 Check that debugobshistory on head show a coherent graph | 1439 Check that debugobshistory on head show a coherent graph |
| 1438 $ hg obslog eb5a0daa2192 --patch | 1440 $ hg obslog eb5a0daa2192 --patch |
| 1439 @ eb5a0daa2192 (4) C0 | 1441 @ eb5a0daa2192 (4) C0 |
| 1440 |\ | 1442 |\ |
| 1441 x | 471f378eab4c (1) A0 | 1443 x | 471f378eab4c (1) A0 |
| 1442 / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 1444 / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 1443 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 1445 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 1444 | --- a/changeset-description | 1446 | --- a/changeset-description |
| 1445 | +++ b/changeset-description | 1447 | +++ b/changeset-description |
| 1446 | @@ -1,1 +1,1 @@ | 1448 | @@ -1,1 +1,1 @@ |
| 1447 | -A0 | 1449 | -A0 |
| 1453 | @@ -0,0 +1,1 @@ | 1455 | @@ -0,0 +1,1 @@ |
| 1454 | +B0 | 1456 | +B0 |
| 1455 | | 1457 | |
| 1456 | | 1458 | |
| 1457 x b7ea6d14e664 (3) B1 | 1459 x b7ea6d14e664 (3) B1 |
| 1458 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 1460 | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 1459 | (No patch available, changesets rebased) | 1461 | (No patch available, changesets rebased) |
| 1460 | | 1462 | |
| 1461 x 0dec01379d3b (2) B0 | 1463 x 0dec01379d3b (2) B0 |
| 1462 rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 1464 rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 1463 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description | 1465 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
| 1471 Check that obslog on ROOT with all option show everything | 1473 Check that obslog on ROOT with all option show everything |
| 1472 $ hg obslog 1 --hidden --all --patch | 1474 $ hg obslog 1 --hidden --all --patch |
| 1473 @ eb5a0daa2192 (4) C0 | 1475 @ eb5a0daa2192 (4) C0 |
| 1474 |\ | 1476 |\ |
| 1475 x | 471f378eab4c (1) A0 | 1477 x | 471f378eab4c (1) A0 |
| 1476 / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 1478 / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 1477 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | 1479 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
| 1478 | --- a/changeset-description | 1480 | --- a/changeset-description |
| 1479 | +++ b/changeset-description | 1481 | +++ b/changeset-description |
| 1480 | @@ -1,1 +1,1 @@ | 1482 | @@ -1,1 +1,1 @@ |
| 1481 | -A0 | 1483 | -A0 |
| 1487 | @@ -0,0 +1,1 @@ | 1489 | @@ -0,0 +1,1 @@ |
| 1488 | +B0 | 1490 | +B0 |
| 1489 | | 1491 | |
| 1490 | | 1492 | |
| 1491 x b7ea6d14e664 (3) B1 | 1493 x b7ea6d14e664 (3) B1 |
| 1492 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | 1494 | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
| 1493 | (No patch available, changesets rebased) | 1495 | (No patch available, changesets rebased) |
| 1494 | | 1496 | |
| 1495 x 0dec01379d3b (2) B0 | 1497 x 0dec01379d3b (2) B0 |
| 1496 rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 1498 rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 1497 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description | 1499 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
| 1520 "effect": [ | 1522 "effect": [ |
| 1521 *, (glob) | 1523 *, (glob) |
| 1522 *, (glob) | 1524 *, (glob) |
| 1523 "content" | 1525 "content" |
| 1524 ], | 1526 ], |
| 1527 "operation": "fold", | |
| 1525 "succnodes": [ | 1528 "succnodes": [ |
| 1526 "eb5a0daa2192" | 1529 "eb5a0daa2192" |
| 1527 ], | 1530 ], |
| 1528 "user": "test", | 1531 "user": "test", |
| 1529 "verb": "rewritten" | 1532 "verb": "rewritten" |
| 1564 ], | 1567 ], |
| 1565 "effect": [ | 1568 "effect": [ |
| 1566 "description", | 1569 "description", |
| 1567 "content" | 1570 "content" |
| 1568 ], | 1571 ], |
| 1572 "operation": "fold", | |
| 1569 "succnodes": [ | 1573 "succnodes": [ |
| 1570 "eb5a0daa2192" | 1574 "eb5a0daa2192" |
| 1571 ], | 1575 ], |
| 1572 "user": "test", | 1576 "user": "test", |
| 1573 "verb": "rewritten" | 1577 "verb": "rewritten" |