Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3108:9c9c8c1eeb93 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.3 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:34:22 +0200
parents a867d59ea97a 67b59d1657cf
children 3024ae293732 3e2abd40da07
comparison
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
39 | summary: A1 39 | summary: A1
40 | 40 |
41 | x changeset: 2:f137d23bb3e1 41 | x changeset: 2:f137d23bb3e1
42 | | user: test 42 | | user: test
43 | | date: Thu Jan 01 00:00:00 1970 +0000 43 | | date: Thu Jan 01 00:00:00 1970 +0000
44 | | obsolete: pruned
45 | | summary: temporary amend commit for 471f378eab4c 44 | | summary: temporary amend commit for 471f378eab4c
46 | | 45 | |
47 | x changeset: 1:471f378eab4c 46 | x changeset: 1:471f378eab4c
48 |/ user: test 47 |/ user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000 48 | date: Thu Jan 01 00:00:00 1970 +0000
50 | obsolete: rewritten as 4ae3a4151de9
51 | summary: A0 49 | summary: A0
52 | 50 |
53 o changeset: 0:ea207398892e 51 o changeset: 0:ea207398892e
54 user: test 52 user: test
55 date: Thu Jan 01 00:00:00 1970 +0000 53 date: Thu Jan 01 00:00:00 1970 +0000
80 78
81 79
82 $ hg obslog --no-graph --patch 4ae3a4151de9 80 $ hg obslog --no-graph --patch 4ae3a4151de9
83 4ae3a4151de9 (3) A1 81 4ae3a4151de9 (3) A1
84 471f378eab4c (1) A0 82 471f378eab4c (1) A0
85 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) 83 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
86 --- a/471f378eab4c-changeset-description 84 --- a/471f378eab4c-changeset-description
87 +++ b/4ae3a4151de9-changeset-description 85 +++ b/4ae3a4151de9-changeset-description
88 @@ -1,1 +1,3 @@ 86 @@ -1,1 +1,3 @@
89 -A0 87 -A0
90 +A1 88 +A1
100 98
101 99
102 $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' 100 $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
103 @ A1 101 @ A1
104 | 102 |
105 x A0 at 0 0 by test 103 x A0 at * by test (glob)
106 104
107 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool 105 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
108 [ 106 [
109 { 107 {
110 "markers": [], 108 "markers": [],
223 $ hg log --hidden -G 221 $ hg log --hidden -G
224 x changeset: 2:0dec01379d3b 222 x changeset: 2:0dec01379d3b
225 | tag: tip 223 | tag: tip
226 | user: test 224 | user: test
227 | date: Thu Jan 01 00:00:00 1970 +0000 225 | date: Thu Jan 01 00:00:00 1970 +0000
228 | obsolete: pruned
229 | summary: B0 226 | summary: B0
230 | 227 |
231 @ changeset: 1:471f378eab4c 228 @ changeset: 1:471f378eab4c
232 | user: test 229 | user: test
233 | date: Thu Jan 01 00:00:00 1970 +0000 230 | date: Thu Jan 01 00:00:00 1970 +0000
363 | summary: A0 360 | summary: A0
364 | 361 |
365 | x changeset: 1:471597cad322 362 | x changeset: 1:471597cad322
366 |/ user: test 363 |/ user: test
367 | date: Thu Jan 01 00:00:00 1970 +0000 364 | date: Thu Jan 01 00:00:00 1970 +0000
368 | obsolete: split as 337fec4d2edc, f257fde29c7a
369 | summary: A0 365 | summary: A0
370 | 366 |
371 o changeset: 0:ea207398892e 367 o changeset: 0:ea207398892e
372 user: test 368 user: test
373 date: Thu Jan 01 00:00:00 1970 +0000 369 date: Thu Jan 01 00:00:00 1970 +0000
617 | summary: A0 613 | summary: A0
618 | 614 |
619 | x changeset: 1:de7290d8b885 615 | x changeset: 1:de7290d8b885
620 |/ user: test 616 |/ user: test
621 | date: Thu Jan 01 00:00:00 1970 +0000 617 | date: Thu Jan 01 00:00:00 1970 +0000
622 | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
623 | summary: A0 618 | summary: A0
624 | 619 |
625 o changeset: 0:ea207398892e 620 o changeset: 0:ea207398892e
626 user: test 621 user: test
627 date: Thu Jan 01 00:00:00 1970 +0000 622 date: Thu Jan 01 00:00:00 1970 +0000
793 | summary: C0 788 | summary: C0
794 | 789 |
795 | x changeset: 2:0dec01379d3b 790 | x changeset: 2:0dec01379d3b
796 | | user: test 791 | | user: test
797 | | date: Thu Jan 01 00:00:00 1970 +0000 792 | | date: Thu Jan 01 00:00:00 1970 +0000
798 | | obsolete: rewritten as eb5a0daa2192
799 | | summary: B0 793 | | summary: B0
800 | | 794 | |
801 | x changeset: 1:471f378eab4c 795 | x changeset: 1:471f378eab4c
802 |/ user: test 796 |/ user: test
803 | date: Thu Jan 01 00:00:00 1970 +0000 797 | date: Thu Jan 01 00:00:00 1970 +0000
804 | obsolete: rewritten as eb5a0daa2192
805 | summary: A0 798 | summary: A0
806 | 799 |
807 o changeset: 0:ea207398892e 800 o changeset: 0:ea207398892e
808 user: test 801 user: test
809 date: Thu Jan 01 00:00:00 1970 +0000 802 date: Thu Jan 01 00:00:00 1970 +0000
1000 | summary: A1 993 | summary: A1
1001 | 994 |
1002 | x changeset: 1:471f378eab4c 995 | x changeset: 1:471f378eab4c
1003 |/ user: test 996 |/ user: test
1004 | date: Thu Jan 01 00:00:00 1970 +0000 997 | date: Thu Jan 01 00:00:00 1970 +0000
1005 | obsolete: reworded as fdf9bde5129a
1006 | summary: A0 998 | summary: A0
1007 | 999 |
1008 o changeset: 0:ea207398892e 1000 o changeset: 0:ea207398892e
1009 user: test 1001 user: test
1010 date: Thu Jan 01 00:00:00 1970 +0000 1002 date: Thu Jan 01 00:00:00 1970 +0000
1033 | summary: A1 1025 | summary: A1
1034 | 1026 |
1035 | x changeset: 1:471f378eab4c 1027 | x changeset: 1:471f378eab4c
1036 |/ user: test 1028 |/ user: test
1037 | date: Thu Jan 01 00:00:00 1970 +0000 1029 | date: Thu Jan 01 00:00:00 1970 +0000
1038 | obsolete: reworded as fdf9bde5129a
1039 | obsolete: reworded as 65b757b745b9
1040 | summary: A0 1030 | summary: A0
1041 | 1031 |
1042 o changeset: 0:ea207398892e 1032 o changeset: 0:ea207398892e
1043 user: test 1033 user: test
1044 date: Thu Jan 01 00:00:00 1970 +0000 1034 date: Thu Jan 01 00:00:00 1970 +0000
1316 | summary: B1 1306 | summary: B1
1317 | 1307 |
1318 | x changeset: 2:0dec01379d3b 1308 | x changeset: 2:0dec01379d3b
1319 |/ user: test 1309 |/ user: test
1320 | date: Thu Jan 01 00:00:00 1970 +0000 1310 | date: Thu Jan 01 00:00:00 1970 +0000
1321 | obsolete: reworded as b7ea6d14e664
1322 | summary: B0 1311 | summary: B0
1323 | 1312 |
1324 o changeset: 1:471f378eab4c 1313 o changeset: 1:471f378eab4c
1325 | user: test 1314 | user: test
1326 | date: Thu Jan 01 00:00:00 1970 +0000 1315 | date: Thu Jan 01 00:00:00 1970 +0000
1344 | 1333 |
1345 | x changeset: 3:b7ea6d14e664 1334 | x changeset: 3:b7ea6d14e664
1346 | | parent: 1:471f378eab4c 1335 | | parent: 1:471f378eab4c
1347 | | user: test 1336 | | user: test
1348 | | date: Thu Jan 01 00:00:00 1970 +0000 1337 | | date: Thu Jan 01 00:00:00 1970 +0000
1349 | | obsolete: rewritten as eb5a0daa2192
1350 | | summary: B1 1338 | | summary: B1
1351 | | 1339 | |
1352 | | x changeset: 2:0dec01379d3b 1340 | | x changeset: 2:0dec01379d3b
1353 | |/ user: test 1341 | |/ user: test
1354 | | date: Thu Jan 01 00:00:00 1970 +0000 1342 | | date: Thu Jan 01 00:00:00 1970 +0000
1355 | | obsolete: reworded as b7ea6d14e664
1356 | | summary: B0 1343 | | summary: B0
1357 | | 1344 | |
1358 | x changeset: 1:471f378eab4c 1345 | x changeset: 1:471f378eab4c
1359 |/ user: test 1346 |/ user: test
1360 | date: Thu Jan 01 00:00:00 1970 +0000 1347 | date: Thu Jan 01 00:00:00 1970 +0000
1361 | obsolete: rewritten as eb5a0daa2192
1362 | summary: A0 1348 | summary: A0
1363 | 1349 |
1364 o changeset: 0:ea207398892e 1350 o changeset: 0:ea207398892e
1365 user: test 1351 user: test
1366 date: Thu Jan 01 00:00:00 1970 +0000 1352 date: Thu Jan 01 00:00:00 1970 +0000
1580 | 1566 |
1581 | x changeset: 2:fdf9bde5129a 1567 | x changeset: 2:fdf9bde5129a
1582 |/ parent: 0:ea207398892e 1568 |/ parent: 0:ea207398892e
1583 | user: test 1569 | user: test
1584 | date: Thu Jan 01 00:00:00 1970 +0000 1570 | date: Thu Jan 01 00:00:00 1970 +0000
1585 | obsolete: reworded as 7a230b46bf61
1586 | summary: A1 1571 | summary: A1
1587 | 1572 |
1588 | x changeset: 1:471f378eab4c 1573 | x changeset: 1:471f378eab4c
1589 |/ user: test 1574 |/ user: test
1590 | date: Thu Jan 01 00:00:00 1970 +0000 1575 | date: Thu Jan 01 00:00:00 1970 +0000
1591 | obsolete: reworded as fdf9bde5129a
1592 | summary: A0 1576 | summary: A0
1593 | 1577 |
1594 o changeset: 0:ea207398892e 1578 o changeset: 0:ea207398892e
1595 user: test 1579 user: test
1596 date: Thu Jan 01 00:00:00 1970 +0000 1580 date: Thu Jan 01 00:00:00 1970 +0000
1627 adding changesets 1611 adding changesets
1628 adding manifests 1612 adding manifests
1629 adding file changes 1613 adding file changes
1630 added 1 changesets with 0 changes to 1 files (+1 heads) 1614 added 1 changesets with 0 changes to 1 files (+1 heads)
1631 2 new obsolescence markers 1615 2 new obsolescence markers
1632 obsoleted 1 changesets
1633 (run 'hg heads' to see heads, 'hg merge' to merge) 1616 (run 'hg heads' to see heads, 'hg merge' to merge)
1634 working directory parent is obsolete! (471f378eab4c) 1617 working directory parent is obsolete! (471f378eab4c)
1635 (use 'hg evolve' to update to its successor: 7a230b46bf61) 1618 (use 'hg evolve' to update to its successor: 7a230b46bf61)
1636 Check that debugobshistory works with markers pointing to missing local 1619 Check that debugobshistory works with markers pointing to missing local
1637 changectx 1620 changectx