evolve: comparison tests/test-evolve-templates.t

equal deleted inserted replaced

-:02cc51ca6795
+:cb5983c0287f
 > tlog = log -G -T '{node|short}\
 >     {if(predecessors, "\n  Predecessors: {predecessors}")}\
 >     {if(predecessors, "\n  semi-colon: {join(predecessors, "; ")}")}\
 >     {if(successors, "\n  Successors: {successors}")}\
 >     {if(successors, "\n  semi-colon: {join(successors, "; ")}")}\
->     {if(obsfate, "\n  Fate: {join(obsfate, "\n  Fate: ")}\n")}\n'
+>     {if(obsfate, "{obsfate % "\n  Fate: {fate}"}")}\
-> fatelog = log -G -T '{node|short}\n{if(obsfate, "  Obsfate: {join(obsfate, "; ")}\n\n")}'
+>     {if(obsorigin, "{obsorigin % "\n  Origin: {origin}"}")}\n\n'
+> fateoriginlog = log -G -T '{node|short}\
+>     {if(obsfate, "\n  Obsfate: {join(obsfate, "; ")}")}\
+>     {if(obsorigin, "\n  Obsorigin: {join(obsorigin, "; ")}")}\n\n'
 > EOF
 Test templates on amended commit
 ================================
 (use 'hg evolve' to update to its successor: d004c8f274b9)
 Predecessors template should show current revision as it is the working copy
 $ hg olog tip
 o  d004c8f274b9 (3) A2
+|    reworded(description) from a468dc9b3633 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
 |
 x  a468dc9b3633 (2) A1
-|    reworded(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
+|    rewritten(description, content) from 471f378eab4c using amend by test (Fri Feb 13 23:31:30 2009 +0000)
 |
 @  471f378eab4c (1) A0
-rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000)
 $ hg tlog
 o  d004c8f274b9
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: rewritten using amend from 1:471f378eab4c by test, test2
+|
 | @  471f378eab4c
 |/     Successors: 3:d004c8f274b9
 |      semi-colon: 3:d004c8f274b9
 |      Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
 |
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     ROOT
-$ hg fatelog -q
+$ hg fateoriginlog -q
 o  d004c8f274b9
+|    Obsorigin: rewritten using amend from 1:471f378eab4c
 |
 | @  471f378eab4c
 |/     Obsfate: rewritten using amend as 3:d004c8f274b9
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  d004c8f274b9
+|    Obsorigin: rewritten using amend from 1:471f378eab4c by test, test2
 |
 | @  471f378eab4c
 |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
 |
 o  ea207398892e
-$ hg fatelog -v
+$ hg fateoriginlog -v
 o  d004c8f274b9
+|    Obsorigin: rewritten using amend from 1:471f378eab4c by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
 |
 | @  471f378eab4c
 |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
 |
 o  ea207398892e
 Predecessors template should show current revision as it is the working copy
 $ hg tlog
 o  d004c8f274b9
 |    Predecessors: 2:a468dc9b3633
 |    semi-colon: 2:a468dc9b3633
+|    Origin: reworded using amend from 2:a468dc9b3633 by test2
+|
 | @  a468dc9b3633
 |/     Successors: 3:d004c8f274b9
 |      semi-colon: 3:d004c8f274b9
 |      Fate: reworded using amend as 3:d004c8f274b9 by test2
 |
 --hidden
 $ hg tlog --hidden
 o  d004c8f274b9
 |    Predecessors: 2:a468dc9b3633
 |    semi-colon: 2:a468dc9b3633
+|    Origin: reworded using amend from 2:a468dc9b3633 by test2
+|
 | @  a468dc9b3633
 |/     Predecessors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
 |      Successors: 3:d004c8f274b9
 |      semi-colon: 3:d004c8f274b9
 |      Fate: reworded using amend as 3:d004c8f274b9 by test2
+|      Origin: rewritten using amend from 1:471f378eab4c
 |
 | x  471f378eab4c
 |/     Successors: 2:a468dc9b3633
 |      semi-colon: 2:a468dc9b3633
 |      Fate: rewritten using amend as 2:a468dc9b3633
 |
 o  ea207398892e
-$ hg fatelog -v
+$ hg fateoriginlog -v
 o  d004c8f274b9
+|    Obsorigin: reworded using amend from 2:a468dc9b3633 by test2 (at 2001-04-19 04:25 +0000)
 |
 | @  a468dc9b3633
 |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
 |
 o  ea207398892e
 $ hg tlog --hidden
 @  d004c8f274b9
 |    Predecessors: 2:a468dc9b3633
 |    semi-colon: 2:a468dc9b3633
+|    Origin: reworded using amend from 2:a468dc9b3633 by test2
+|
 | x  a468dc9b3633
 |/     Predecessors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
 |      Successors: 3:d004c8f274b9
 |      semi-colon: 3:d004c8f274b9
 |      Fate: reworded using amend as 3:d004c8f274b9 by test2
+|      Origin: rewritten using amend from 1:471f378eab4c
 |
 | x  471f378eab4c
 |/     Successors: 2:a468dc9b3633
 |      semi-colon: 2:a468dc9b3633
 |      Fate: rewritten using amend as 2:a468dc9b3633
 |
 o  ea207398892e
-$ hg fatelog -v
+$ hg fateoriginlog -v
 @  d004c8f274b9
 |
 o  ea207398892e
-$ hg fatelog -v --hidden
+$ hg fateoriginlog -v --hidden
 @  d004c8f274b9
+|    Obsorigin: reworded using amend from 2:a468dc9b3633 by test2 (at 2001-04-19 04:25 +0000)
 |
 | x  a468dc9b3633
 |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+|      Obsorigin: rewritten using amend from 1:471f378eab4c by test (at 2009-02-13 23:31 +0000)
 |
 | x  471f378eab4c
 |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
 |
 o  ea207398892e
 Predecessors template should show current revision as it is the working copy
 $ hg tlog
 o  f257fde29c7a
 |    Predecessors: 1:471597cad322
 |    semi-colon: 1:471597cad322
+|    Origin: split using split from 1:471597cad322
+|
 o  337fec4d2edc
 |    Predecessors: 1:471597cad322
 |    semi-colon: 1:471597cad322
+|    Origin: split using split from 1:471597cad322
+|
 | @  471597cad322
 |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
 |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
 |      Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  f257fde29c7a
+|    Obsorigin: split using split from 1:471597cad322
 |
 o  337fec4d2edc
+|    Obsorigin: split using split from 1:471597cad322
 |
 | @  471597cad322
 |/     Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
 |
 o  ea207398892e
 --hidden
 $ hg tlog --hidden
 @  f257fde29c7a
 |    Predecessors: 1:471597cad322
 |    semi-colon: 1:471597cad322
+|    Origin: split using split from 1:471597cad322
+|
 o  337fec4d2edc
 |    Predecessors: 1:471597cad322
 |    semi-colon: 1:471597cad322
+|    Origin: split using split from 1:471597cad322
+|
 | x  471597cad322
 |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
 |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
 |      Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
 |
 o  ea207398892e
-$ hg fatelog --hidden
+$ hg fateoriginlog --hidden
 @  f257fde29c7a
+|    Obsorigin: split using split from 1:471597cad322
 |
 o  337fec4d2edc
+|    Obsorigin: split using split from 1:471597cad322
 |
 | x  471597cad322
 |/     Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
 |
 o  ea207398892e
 Predecessors template should show current revision as it is the working copy
 $ hg tlog
 o  eb5a0daa2192
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: rewritten using fold from 1:471f378eab4c
+|
 | @  471f378eab4c
 |/     Successors: 3:eb5a0daa2192
 |      semi-colon: 3:eb5a0daa2192
 |      Fate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  eb5a0daa2192
+|    Obsorigin: rewritten using fold from 1:471f378eab4c
 |
 | @  471f378eab4c
 |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 displayed
 $ hg tlog
 o  eb5a0daa2192
 |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
 |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+|    Origin: rewritten using fold from 2:0dec01379d3b
+|    Origin: rewritten using fold from 1:471f378eab4c
+|
 | @  0dec01379d3b
 | |    Successors: 3:eb5a0daa2192
 | |    semi-colon: 3:eb5a0daa2192
 | |    Fate: rewritten using fold as 3:eb5a0daa2192
 | |
 |      semi-colon: 3:eb5a0daa2192
 |      Fate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  eb5a0daa2192
+|    Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
 |
 | @  0dec01379d3b
 | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
 | |
 | x  471f378eab4c
 --hidden
 $ hg tlog --hidden
 @  eb5a0daa2192
 |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
 |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+|    Origin: rewritten using fold from 2:0dec01379d3b
+|    Origin: rewritten using fold from 1:471f378eab4c
+|
 | x  0dec01379d3b
 | |    Successors: 3:eb5a0daa2192
 | |    semi-colon: 3:eb5a0daa2192
 | |    Fate: rewritten using fold as 3:eb5a0daa2192
 | |
 |      semi-colon: 3:eb5a0daa2192
 |      Fate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog --hidden
+$ hg fateoriginlog --hidden
 @  eb5a0daa2192
+|    Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
 |
 | x  0dec01379d3b
 | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
 | |
 | x  471f378eab4c
 Predecessors template should show current revision as it is the working copy
 $ hg tlog
 *  019fadeab383
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: reworded using amend from 1:471f378eab4c
+|
 | *  fdf9bde5129a
 |/     Predecessors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
+|      Origin: reworded using amend from 1:471f378eab4c
+|
 | @  471f378eab4c
 |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
 |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
 |      Fate: reworded using amend as 2:fdf9bde5129a
 |      Fate: reworded using amend as 4:019fadeab383
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 *  019fadeab383
+|    Obsorigin: reworded using amend from 1:471f378eab4c
 |
 | *  fdf9bde5129a
-|/
+|/     Obsorigin: reworded using amend from 1:471f378eab4c
+|
 | @  471f378eab4c
 |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
 |
 o  ea207398892e
 | @  fdf9bde5129a
 |/
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 *  019fadeab383
 |
 | @  fdf9bde5129a
 |/
 o  ea207398892e
 Predecessors template should a precursor as we force its display with --hidden
 $ hg tlog --hidden
 *  019fadeab383
 |    Predecessors: 3:65b757b745b9
 |    semi-colon: 3:65b757b745b9
+|    Origin: reworded using amend from 3:65b757b745b9
+|
 | x  65b757b745b9
 |/     Predecessors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
 |      Successors: 4:019fadeab383
 |      semi-colon: 4:019fadeab383
 |      Fate: reworded using amend as 4:019fadeab383
+|      Origin: reworded using amend from 1:471f378eab4c
 |
 | @  fdf9bde5129a
 |/     Predecessors: 1:471f378eab4c
 |      semi-colon: 1:471f378eab4c
+|      Origin: reworded using amend from 1:471f378eab4c
+|
 | x  471f378eab4c
 |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
 |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
 |      Fate: reworded using amend as 2:fdf9bde5129a
 |      Fate: reworded using amend as 3:65b757b745b9
 |
 o  ea207398892e
-$ hg fatelog --hidden
+$ hg fateoriginlog --hidden
 *  019fadeab383
+|    Obsorigin: reworded using amend from 3:65b757b745b9
 |
 | x  65b757b745b9
 |/     Obsfate: reworded using amend as 4:019fadeab383
+|      Obsorigin: reworded using amend from 1:471f378eab4c
 |
 | @  fdf9bde5129a
-|/
+|/     Obsorigin: reworded using amend from 1:471f378eab4c
+|
 | x  471f378eab4c
 |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
 |
 o  ea207398892e
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 $ hg tlog
 o  eb5a0daa2192
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: rewritten using fold from 1:471f378eab4c
+|
 | @  471f378eab4c
 |/     Successors: 4:eb5a0daa2192
 |      semi-colon: 4:eb5a0daa2192
 |      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  eb5a0daa2192
+|    Obsorigin: rewritten using fold from 1:471f378eab4c
 |
 | @  471f378eab4c
 |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 $ hg tlog
 o  eb5a0daa2192
 |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
 |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+|    Origin: rewritten using amend, fold from 2:0dec01379d3b
+|    Origin: rewritten using fold from 1:471f378eab4c
+|
 | @  0dec01379d3b
 | |    Successors: 4:eb5a0daa2192
 | |    semi-colon: 4:eb5a0daa2192
 | |    Fate: rewritten using amend, fold as 4:eb5a0daa2192
 | |
 |      semi-colon: 4:eb5a0daa2192
 |      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  eb5a0daa2192
+|    Obsorigin: rewritten using amend, fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
 |
 | @  0dec01379d3b
 | |    Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
 | |
 | x  471f378eab4c
 (use 'hg evolve' to update to its successor: eb5a0daa2192)
 $ hg tlog
 o  eb5a0daa2192
 |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
 |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
+|    Origin: rewritten using fold from 1:471f378eab4c
+|    Origin: rewritten using fold from 3:b7ea6d14e664
+|
 | @  b7ea6d14e664
 | |    Successors: 4:eb5a0daa2192
 | |    semi-colon: 4:eb5a0daa2192
 | |    Fate: rewritten using fold as 4:eb5a0daa2192
 | |
 |      semi-colon: 4:eb5a0daa2192
 |      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  eb5a0daa2192
+|    Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664
 |
 | @  b7ea6d14e664
 | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
 | |
 | x  471f378eab4c
 $ hg tlog --hidden
 @  eb5a0daa2192
 |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
 |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
+|    Origin: rewritten using fold from 1:471f378eab4c
+|    Origin: rewritten using fold from 3:b7ea6d14e664
+|
 | x  b7ea6d14e664
 | |    Predecessors: 2:0dec01379d3b
 | |    semi-colon: 2:0dec01379d3b
 | |    Successors: 4:eb5a0daa2192
 | |    semi-colon: 4:eb5a0daa2192
 | |    Fate: rewritten using fold as 4:eb5a0daa2192
+| |    Origin: reworded using amend from 2:0dec01379d3b
 | |
 | | x  0dec01379d3b
 | |/     Successors: 3:b7ea6d14e664
 | |      semi-colon: 3:b7ea6d14e664
 | |      Fate: reworded using amend as 3:b7ea6d14e664
 |      semi-colon: 4:eb5a0daa2192
 |      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
-$ hg fatelog --hidden
+$ hg fateoriginlog --hidden
 @  eb5a0daa2192
+|    Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664
 |
 | x  b7ea6d14e664
 | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
+| |    Obsorigin: reworded using amend from 2:0dec01379d3b
 | |
 | | x  0dec01379d3b
 | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
 | |
 | x  471f378eab4c
 $ hg tlog
 o  7a230b46bf61
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: reworded using amend from 1:471f378eab4c
+|
 | @  471f378eab4c
 |/     Successors: 2:7a230b46bf61
 |      semi-colon: 2:7a230b46bf61
 |      Fate: reworded using amend as 2:7a230b46bf61
 |
 o  ea207398892e
-$ hg fatelog --hidden -v
+$ hg fateoriginlog --hidden -v
 o  7a230b46bf61
+|    Obsorigin: reworded using amend from 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
 |
 | @  471f378eab4c
 |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
 |
 o  ea207398892e
 $ hg tlog
 @  7a230b46bf61
 |
 o  ea207398892e
-$ hg fatelog -v
+$ hg fateoriginlog -v
 @  7a230b46bf61
 |
 o  ea207398892e
 $ hg tlog --hidden
 @  7a230b46bf61
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: reworded using amend from 1:471f378eab4c
+|
 | x  471f378eab4c
 |/     Successors: 2:7a230b46bf61
 |      semi-colon: 2:7a230b46bf61
 |      Fate: reworded using amend as 2:7a230b46bf61
 |
 o  ea207398892e
-$ hg fatelog --hidden -v
+$ hg fateoriginlog --hidden -v
 @  7a230b46bf61
+|    Obsorigin: reworded using amend from 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
 |
 | x  471f378eab4c
 |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
 |
 o  ea207398892e
 $ hg tlog
 @  f897c6137566
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 @  f897c6137566
 |
 o  ea207398892e
 $ hg up -r "desc(B0)" --hidden
 (use 'hg evolve' to update to its parent successor)
 $ hg tlog
 o  f897c6137566
 |    Predecessors: 2:0dec01379d3b
 |    semi-colon: 2:0dec01379d3b
+|    Origin: rewritten from 2:0dec01379d3b
+|
 | @  0dec01379d3b
 | |    Predecessors: 1:471f378eab4c
 | |    semi-colon: 1:471f378eab4c
 | |    Successors: 3:f897c6137566; 1:471f378eab4c
 | |    semi-colon: 3:f897c6137566; 1:471f378eab4c
 | |    Fate: rewritten as 3:f897c6137566
 | |    Fate: rewritten as 1:471f378eab4c
+| |    Origin: rewritten from 1:471f378eab4c
 | |
 | x  471f378eab4c
 |/     Predecessors: 2:0dec01379d3b
 |      semi-colon: 2:0dec01379d3b
 |      Successors: 2:0dec01379d3b
 |      semi-colon: 2:0dec01379d3b
 |      Fate: rewritten as 2:0dec01379d3b
-|
+|      Origin: rewritten from 2:0dec01379d3b
-o  ea207398892e
+|
+o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  f897c6137566
+|    Obsorigin: rewritten from 2:0dec01379d3b
 |
 | @  0dec01379d3b
 | |    Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
+| |    Obsorigin: rewritten from 1:471f378eab4c
 | |
 | x  471f378eab4c
 |/     Obsfate: rewritten as 2:0dec01379d3b
+|      Obsorigin: rewritten from 2:0dec01379d3b
 |
 o  ea207398892e
 $ hg up -r "desc(A0)" --hidden
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 (use 'hg evolve' to update to its parent successor)
 $ hg tlog
 o  f897c6137566
 |    Predecessors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
+|    Origin: rewritten from 1:471f378eab4c
+|
 | @  471f378eab4c
 |/     Fate: pruned
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  f897c6137566
+|    Obsorigin: rewritten from 1:471f378eab4c
 |
 | @  471f378eab4c
 |/     Obsfate: pruned
 |
 o  ea207398892e
 $ hg tlog
 o  f897c6137566
 |
 @  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 o  f897c6137566
 |
 @  ea207398892e
 $ hg tlog --hidden
 o  f897c6137566
 |    Predecessors: 2:0dec01379d3b
 |    semi-colon: 2:0dec01379d3b
+|    Origin: rewritten from 2:0dec01379d3b
+|
 | x  0dec01379d3b
 | |    Predecessors: 1:471f378eab4c
 | |    semi-colon: 1:471f378eab4c
 | |    Successors: 3:f897c6137566; 1:471f378eab4c
 | |    semi-colon: 3:f897c6137566; 1:471f378eab4c
 | |    Fate: rewritten as 3:f897c6137566
 | |    Fate: rewritten as 1:471f378eab4c
+| |    Origin: rewritten from 1:471f378eab4c
 | |
 | x  471f378eab4c
 |/     Predecessors: 2:0dec01379d3b
 |      semi-colon: 2:0dec01379d3b
 |      Successors: 2:0dec01379d3b
 |      semi-colon: 2:0dec01379d3b
 |      Fate: rewritten as 2:0dec01379d3b
+|      Origin: rewritten from 2:0dec01379d3b
 |
 @  ea207398892e
 Test template with split + divergence with cycles
 =================================================
 $ hg tlog
 @  0b997eb7ceee
 |    Predecessors: 6:4a004186e638
 |    semi-colon: 6:4a004186e638
+|    Origin: reworded using amend from 6:4a004186e638
+|
 | *  b18bc8331526
 |/     Predecessors: 6:4a004186e638
 |      semi-colon: 6:4a004186e638
+|      Origin: reworded using amend from 6:4a004186e638
+|
 | *  ba2ed02b0c9a
 | |
 | x  4a004186e638
 |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
 |      semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
 |
 o  f897c6137566
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 @  0b997eb7ceee
+|    Obsorigin: reworded using amend from 6:4a004186e638
 |
 | *  b18bc8331526
-|/
+|/     Obsorigin: reworded using amend from 6:4a004186e638
+|
 | *  ba2ed02b0c9a
 | |
 | x  4a004186e638
 |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
 |
 $ hg tlog --hidden
 @  0b997eb7ceee
 |    Predecessors: 6:4a004186e638
 |    semi-colon: 6:4a004186e638
+|    Origin: reworded using amend from 6:4a004186e638
+|
 | *  b18bc8331526
 |/     Predecessors: 6:4a004186e638
 |      semi-colon: 6:4a004186e638
+|      Origin: reworded using amend from 6:4a004186e638
+|
 | *  ba2ed02b0c9a
 | |    Predecessors: 4:9bd10a0775e4
 | |    semi-colon: 4:9bd10a0775e4
+| |    Origin: split from 4:9bd10a0775e4
+| |
 | x  4a004186e638
 |/     Predecessors: 4:9bd10a0775e4
 |      semi-colon: 4:9bd10a0775e4
 |      Successors: 8:b18bc8331526; 9:0b997eb7ceee
 |      semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
 |      Fate: reworded using amend as 8:b18bc8331526
 |      Fate: reworded using amend as 9:0b997eb7ceee
+|      Origin: split from 4:9bd10a0775e4
 |
 *  dd800401bd8c
 |    Predecessors: 4:9bd10a0775e4
 |    semi-colon: 4:9bd10a0775e4
+|    Origin: split from 4:9bd10a0775e4
+|
 | x  9bd10a0775e4
 |/     Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
 |      semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
 |      Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
 |
 o  f897c6137566
 |    Predecessors: 2:0dec01379d3b
 |    semi-colon: 2:0dec01379d3b
+|    Origin: rewritten from 2:0dec01379d3b
+|
 | x  0dec01379d3b
 | |    Predecessors: 1:471f378eab4c
 | |    semi-colon: 1:471f378eab4c
 | |    Successors: 3:f897c6137566; 1:471f378eab4c
 | |    semi-colon: 3:f897c6137566; 1:471f378eab4c
 | |    Fate: rewritten as 3:f897c6137566
 | |    Fate: rewritten as 1:471f378eab4c
+| |    Origin: rewritten from 1:471f378eab4c
 | |
 | x  471f378eab4c
 |/     Predecessors: 2:0dec01379d3b
 |      semi-colon: 2:0dec01379d3b
 |      Successors: 2:0dec01379d3b
 |      semi-colon: 2:0dec01379d3b
 |      Fate: rewritten as 2:0dec01379d3b
-|
+|      Origin: rewritten from 2:0dec01379d3b
-o  ea207398892e
+|
+o  ea207398892e
-$ hg fatelog --hidden
+$ hg fateoriginlog --hidden
 @  0b997eb7ceee
+|    Obsorigin: reworded using amend from 6:4a004186e638
 |
 | *  b18bc8331526
-|/
+|/     Obsorigin: reworded using amend from 6:4a004186e638
+|
 | *  ba2ed02b0c9a
+| |    Obsorigin: split from 4:9bd10a0775e4
 | |
 | x  4a004186e638
 |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
+|      Obsorigin: split from 4:9bd10a0775e4
 |
 *  dd800401bd8c
+|    Obsorigin: split from 4:9bd10a0775e4
 |
 | x  9bd10a0775e4
 |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
 |
 o  f897c6137566
+|    Obsorigin: rewritten from 2:0dec01379d3b
 |
 | x  0dec01379d3b
 | |    Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
+| |    Obsorigin: rewritten from 1:471f378eab4c
 | |
 | x  471f378eab4c
 |/     Obsfate: rewritten as 2:0dec01379d3b
+|      Obsorigin: rewritten from 2:0dec01379d3b
 |
 o  ea207398892e
 $ hg up --hidden 4
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 rebasing 7:ba2ed02b0c9a "Add A,B,C"
 $ hg tlog
 *  eceed8f98ffc
 |    Predecessors: 4:9bd10a0775e4
 |    semi-colon: 4:9bd10a0775e4
+|    Origin: rewritten using rebase from 4:9bd10a0775e4
+|
 | *  0b997eb7ceee
 | |    Predecessors: 4:9bd10a0775e4
 | |    semi-colon: 4:9bd10a0775e4
+| |    Origin: rewritten using amend from 4:9bd10a0775e4
+| |
 * |  b18bc8331526
 |/     Predecessors: 4:9bd10a0775e4
 |      semi-colon: 4:9bd10a0775e4
+|      Origin: rewritten using amend from 4:9bd10a0775e4
+|
 *  dd800401bd8c
 |    Predecessors: 4:9bd10a0775e4
 |    semi-colon: 4:9bd10a0775e4
+|    Origin: split from 4:9bd10a0775e4
+|
 | @  9bd10a0775e4
 |/     Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
 |      semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
 |      Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc
 |      Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
 |
 o  f897c6137566
 |
 o  ea207398892e
-$ hg fatelog
+$ hg fateoriginlog
 *  eceed8f98ffc
+|    Obsorigin: rewritten using rebase from 4:9bd10a0775e4
 |
 | *  0b997eb7ceee
+| |    Obsorigin: rewritten using amend from 4:9bd10a0775e4
 | |
 * |  b18bc8331526
-|/
+|/     Obsorigin: rewritten using amend from 4:9bd10a0775e4
+|
 *  dd800401bd8c
+|    Obsorigin: split from 4:9bd10a0775e4
 |
 | @  9bd10a0775e4
 |/     Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
 |
 o  f897c6137566
 @  471f378eab4c
 |    Fate: pruned using prune
 |
 o  ea207398892e
-$ hg fatelog -v
+$ hg fateoriginlog -v
 @  471f378eab4c
 |    Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000)
 |
 o  ea207398892e
+Test templates when having multiple unrelated predecessors
+==========================================================
+$ hg init $TESTTMP/templates-local-multipreds
+$ cd $TESTTMP/templates-local-multipreds
+$ mkcommit R
+$ mkcommit A
+$ mkcommit B
+$ hg up 'desc(R)'
+0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+$ mkcommit C
+created new head
+$ hg up 'desc(R)'
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ mkcommit Z
+created new head
+$ hg up 'desc(R)'
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+$ hg prune -r 'desc(A) + desc(B)' -s 'desc(Z)' --fold
+2 changesets pruned
+$ hg prune -r 'desc(C)' -s 'desc(Z)'
+1 changesets pruned
+$ hg debugobsolete
+944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
+36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
+$ hg tlog
+o  4568aafd15c0
+|
+@  7ca5bfdbe243
+$ hg tlog --hidden
+o  4568aafd15c0
+|    Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1
+|    semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1
+|    Origin: rewritten using prune from 2:36ca49338d3a
+|    Origin: rewritten using prune from 3:5b3370228fe5
+|    Origin: rewritten using prune from 1:944ade52b6a1
+|
+| x  5b3370228fe5
+|/     Successors: 4:4568aafd15c0
+|      semi-colon: 4:4568aafd15c0
+|      Fate: rewritten using prune as 4:4568aafd15c0
+|
+| x  36ca49338d3a
+| |    Successors: 4:4568aafd15c0
+| |    semi-colon: 4:4568aafd15c0
+| |    Fate: rewritten using prune as 4:4568aafd15c0
+| |
+| x  944ade52b6a1
+|/     Successors: 4:4568aafd15c0
+|      semi-colon: 4:4568aafd15c0
+|      Fate: rewritten using prune as 4:4568aafd15c0
+|
+@  7ca5bfdbe243

branch	mercurial-4.7
changeset 5367	cb5983c0287f
parent 5162	a7fb433faab6
parent 5364	be5aa681c122
child 5368	844b1ad5b34b