equal
deleted
inserted
replaced
548 @@ -1,1 +1,1 @@ |
548 @@ -1,1 +1,1 @@ |
549 -Fx bug |
549 -Fx bug |
550 +Fix bug |
550 +Fix bug |
551 |
551 |
552 |
552 |
553 $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "precursors(typo)" --hidden |
553 $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "predecessors(typo)" --hidden |
554 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
554 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
555 | |
555 | |
556 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
556 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
557 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
557 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
558 |
558 |
1000 |
1000 |
1001 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/behind-the-hoods/ |
1001 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/behind-the-hoods/ |
1002 |
1002 |
1003 Amend |
1003 Amend |
1004 |
1004 |
1005 $ html_output $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log log -G -r "::precursors(typo)" --hidden |
1005 $ html_output $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log log -G -r "::predecessors(typo)" --hidden |
1006 x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
1006 x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
1007 | branch: typo |
1007 | branch: typo |
1008 | user: Boris Feld <boris.feld@octobus.net> |
1008 | user: Boris Feld <boris.feld@octobus.net> |
1009 | date: Thu Dec 07 11:26:53 2017 +0100 |
1009 | date: Thu Dec 07 11:26:53 2017 +0100 |
1010 | obsolete: reworded using amend as 17:708369dc1bfe |
1010 | obsolete: reworded using amend as 17:708369dc1bfe |
1014 user: Boris Feld <boris.feld@octobus.net> |
1014 user: Boris Feld <boris.feld@octobus.net> |
1015 date: Thu Dec 07 11:26:05 2017 +0100 |
1015 date: Thu Dec 07 11:26:05 2017 +0100 |
1016 summary: ROOT |
1016 summary: ROOT |
1017 |
1017 |
1018 |
1018 |
1019 XXX Remove the command line to avoid showing precursors and hidden revset |
1019 XXX Remove the command line to avoid showing predecessors and hidden revset |
1020 |
1020 |
1021 $ tail -n +2 $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log | tee $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log |
1021 $ tail -n +2 $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log | tee $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log |
1022 x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
1022 x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
1023 | branch: typo |
1023 | branch: typo |
1024 | user: Boris Feld <boris.feld@octobus.net> |
1024 | user: Boris Feld <boris.feld@octobus.net> |
1119 |
1119 |
1120 |
1120 |
1121 |
1121 |
1122 Rebase |
1122 Rebase |
1123 |
1123 |
1124 $ html_output $TESTDIR/output/behind-the-hood-rebase-before-hash-hidden.log log -G -r "::branch(build/v2) or ::precursors('build/linuxsupport-v2')" --hidden |
1124 $ html_output $TESTDIR/output/behind-the-hood-rebase-before-hash-hidden.log log -G -r "::branch(build/v2) or ::predecessors('build/linuxsupport-v2')" --hidden |
1125 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
1125 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
1126 | branch: build/v2 |
1126 | branch: build/v2 |
1127 | parent: 2:f3bd0ab4ee87 |
1127 | parent: 2:f3bd0ab4ee87 |
1128 | user: Boris Feld <boris.feld@octobus.net> |
1128 | user: Boris Feld <boris.feld@octobus.net> |
1129 | date: Mon Dec 11 11:22:16 2017 +0100 |
1129 | date: Mon Dec 11 11:22:16 2017 +0100 |
2591 <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2591 <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2592 <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2 |
2592 <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2 |
2593 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2593 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2594 b0^ New commit on build/v2 (base) |
2594 b0^ New commit on build/v2 (base) |
2595 |
2595 |
2596 $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::precursors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes |
2596 $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::predecessors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes |
2597 Wrote */graphs/basic-stabilize-after-stack.dot (glob) |
2597 Wrote */graphs/basic-stabilize-after-stack.dot (glob) |
2598 .. graphviz:: |
2598 .. graphviz:: |
2599 |
2599 |
2600 strict digraph "Mercurial graph" { |
2600 strict digraph "Mercurial graph" { |
2601 graph [rankdir=LR, |
2601 graph [rankdir=LR, |