tests/test-obsmarker-template.t
changeset 33930 e278d6d2d7d2
parent 33794 6c1a9fd8361b
child 34011 3d0f8918351b
equal deleted inserted replaced
33929:34e10e09afa5 33930:e278d6d2d7d2
     9   > interactive = true
     9   > interactive = true
    10   > [phases]
    10   > [phases]
    11   > publish=False
    11   > publish=False
    12   > [experimental]
    12   > [experimental]
    13   > stabilization=all
    13   > stabilization=all
       
    14   > [templates]
       
    15   > obsfatesuccessors = " as {join(successors, ", ")}"
       
    16   > obsfate = "rewritten{obsfatesuccessors}; "
    14   > [alias]
    17   > [alias]
    15   > tlog = log -G -T '{node|short}\
    18   > tlog = log -G -T '{node|short}\
    16   >     {if(predecessors, "\n  Predecessors: {predecessors}")}\
    19   >     {if(predecessors, "\n  Predecessors: {predecessors}")}\
    17   >     {if(predecessors, "\n  semi-colon: {join(predecessors, "; ")}")}\
    20   >     {if(predecessors, "\n  semi-colon: {join(predecessors, "; ")}")}\
    18   >     {if(predecessors, "\n  json: {predecessors|json}")}\
    21   >     {if(predecessors, "\n  json: {predecessors|json}")}\
    19   >     {if(predecessors, "\n  map: {join(predecessors % "{rev}:{node}", " ")}")}\
    22   >     {if(predecessors, "\n  map: {join(predecessors % "{rev}:{node}", " ")}")}\
    20   >     {if(successorssets, "\n  Successors: {successorssets}")}\
    23   >     {if(successorssets, "\n  Successors: {successorssets}")}\
    21   >     {if(successorssets, "\n  multi-line: {join(successorssets, "\n  multi-line: ")}")}\
    24   >     {if(successorssets, "\n  multi-line: {join(successorssets, "\n  multi-line: ")}")}\
    22   >     {if(successorssets, "\n  json: {successorssets|json}")}\n'
    25   >     {if(successorssets, "\n  json: {successorssets|json}")}\n'
       
    26   > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers % "{obsfate}"} \n" )}'
       
    27   > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers|json}\n")}'
    23   > EOF
    28   > EOF
    24 
    29 
    25 Test templates on amended commit
    30 Test templates on amended commit
    26 ================================
    31 ================================
    27 
    32 
    31   $ hg init $TESTTMP/templates-local-amend
    36   $ hg init $TESTTMP/templates-local-amend
    32   $ cd $TESTTMP/templates-local-amend
    37   $ cd $TESTTMP/templates-local-amend
    33   $ mkcommit ROOT
    38   $ mkcommit ROOT
    34   $ mkcommit A0
    39   $ mkcommit A0
    35   $ echo 42 >> A0
    40   $ echo 42 >> A0
    36   $ hg commit --amend -m "A1"
    41   $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
    37   $ hg commit --amend -m "A2"
    42   $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0"
    38 
    43 
    39   $ hg log --hidden -G
    44   $ hg log --hidden -G
    40   @  changeset:   4:d004c8f274b9
    45   @  changeset:   4:d004c8f274b9
    41   |  tag:         tip
    46   |  tag:         tip
    42   |  parent:      0:ea207398892e
    47   |  parent:      0:ea207398892e
    81   |/     Successors: 4:d004c8f274b9
    86   |/     Successors: 4:d004c8f274b9
    82   |      multi-line: 4:d004c8f274b9
    87   |      multi-line: 4:d004c8f274b9
    83   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
    88   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
    84   o  ea207398892e
    89   o  ea207398892e
    85   
    90   
       
    91   $ hg fatelog -q --traceback
       
    92   o  d004c8f274b9
       
    93   |
       
    94   | @  471f378eab4c
       
    95   |/     Obsfate: rewritten as 4:d004c8f274b9;
       
    96   o  ea207398892e
       
    97   
       
    98   $ hg fatelog
       
    99   o  d004c8f274b9
       
   100   |
       
   101   | @  471f378eab4c
       
   102   |/     Obsfate: rewritten as 4:d004c8f274b9;
       
   103   o  ea207398892e
       
   104   
       
   105   $ hg fatelog -v
       
   106   o  d004c8f274b9
       
   107   |
       
   108   | @  471f378eab4c
       
   109   |/     Obsfate: rewritten as 4:d004c8f274b9;
       
   110   o  ea207398892e
       
   111   
    86   $ hg up 'desc(A1)' --hidden
   112   $ hg up 'desc(A1)' --hidden
    87   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   113   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    88 
   114 
    89 Predecessors template should show current revision as it is the working copy
   115 Predecessors template should show current revision as it is the working copy
    90   $ hg tlog
   116   $ hg tlog
    95   |    map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
   121   |    map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad
    96   | @  a468dc9b3633
   122   | @  a468dc9b3633
    97   |/     Successors: 4:d004c8f274b9
   123   |/     Successors: 4:d004c8f274b9
    98   |      multi-line: 4:d004c8f274b9
   124   |      multi-line: 4:d004c8f274b9
    99   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   125   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
       
   126   o  ea207398892e
       
   127   
       
   128   $ hg fatelog -v
       
   129   o  d004c8f274b9
       
   130   |
       
   131   | @  a468dc9b3633
       
   132   |/     Obsfate: rewritten as 4:d004c8f274b9;
   100   o  ea207398892e
   133   o  ea207398892e
   101   
   134   
   102 Predecessors template should show all the predecessors as we force their display
   135 Predecessors template should show all the predecessors as we force their display
   103 with --hidden
   136 with --hidden
   104   $ hg tlog --hidden
   137   $ hg tlog --hidden
   121   |/     Successors: 3:a468dc9b3633
   154   |/     Successors: 3:a468dc9b3633
   122   |      multi-line: 3:a468dc9b3633
   155   |      multi-line: 3:a468dc9b3633
   123   |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
   156   |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
   124   o  ea207398892e
   157   o  ea207398892e
   125   
   158   
       
   159   $ hg fatelog --hidden -q
       
   160   o  d004c8f274b9
       
   161   |
       
   162   | @  a468dc9b3633
       
   163   |/     Obsfate: rewritten as 4:d004c8f274b9;
       
   164   | x  f137d23bb3e1
       
   165   | |
       
   166   | x  471f378eab4c
       
   167   |/     Obsfate: rewritten as 3:a468dc9b3633;
       
   168   o  ea207398892e
       
   169   
   126 
   170 
   127 Predecessors template shouldn't show anything as all obsolete commit are not
   171 Predecessors template shouldn't show anything as all obsolete commit are not
   128 visible.
   172 visible.
   129   $ hg up 'desc(A2)'
   173   $ hg up 'desc(A2)'
   130   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   174   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   153   |/     Successors: 3:a468dc9b3633
   197   |/     Successors: 3:a468dc9b3633
   154   |      multi-line: 3:a468dc9b3633
   198   |      multi-line: 3:a468dc9b3633
   155   |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
   199   |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
   156   o  ea207398892e
   200   o  ea207398892e
   157   
   201   
   158 
   202   $ hg fatelog -v
       
   203   @  d004c8f274b9
       
   204   |
       
   205   o  ea207398892e
       
   206   
       
   207 
       
   208   $ hg fatelog -v --hidden
       
   209   @  d004c8f274b9
       
   210   |
       
   211   | x  a468dc9b3633
       
   212   |/     Obsfate: rewritten as 4:d004c8f274b9;
       
   213   | x  f137d23bb3e1
       
   214   | |
       
   215   | x  471f378eab4c
       
   216   |/     Obsfate: rewritten as 3:a468dc9b3633;
       
   217   o  ea207398892e
       
   218   
       
   219 
       
   220   $ hg fatelogjson --hidden
       
   221   @  d004c8f274b9
       
   222   |
       
   223   | x  a468dc9b3633
       
   224   |/     Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
       
   225   | x  f137d23bb3e1
       
   226   | |
       
   227   | x  471f378eab4c
       
   228   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
       
   229   o  ea207398892e
       
   230   
   159 Test templates with splitted commit
   231 Test templates with splitted commit
   160 ===================================
   232 ===================================
   161 
   233 
   162   $ hg init $TESTTMP/templates-local-split
   234   $ hg init $TESTTMP/templates-local-split
   163   $ cd $TESTTMP/templates-local-split
   235   $ cd $TESTTMP/templates-local-split
   235   |    map: 1:471597cad322d1f659bb169751be9133dad92ef3
   307   |    map: 1:471597cad322d1f659bb169751be9133dad92ef3
   236   | @  471597cad322
   308   | @  471597cad322
   237   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   309   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   238   |      multi-line: 2:337fec4d2edc 3:f257fde29c7a
   310   |      multi-line: 2:337fec4d2edc 3:f257fde29c7a
   239   |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
   311   |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
       
   312   o  ea207398892e
       
   313   
       
   314 
       
   315   $ hg fatelog
       
   316   o  f257fde29c7a
       
   317   |
       
   318   o  337fec4d2edc
       
   319   |
       
   320   | @  471597cad322
       
   321   |/     Obsfate: rewritten as 2:337fec4d2edc, 3:f257fde29c7a;
   240   o  ea207398892e
   322   o  ea207398892e
   241   
   323   
   242   $ hg up f257fde29c7a
   324   $ hg up f257fde29c7a
   243   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   325   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   244 
   326 
   268   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   350   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   269   |      multi-line: 2:337fec4d2edc 3:f257fde29c7a
   351   |      multi-line: 2:337fec4d2edc 3:f257fde29c7a
   270   |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
   352   |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
   271   o  ea207398892e
   353   o  ea207398892e
   272   
   354   
       
   355 
       
   356   $ hg fatelog --hidden
       
   357   @  f257fde29c7a
       
   358   |
       
   359   o  337fec4d2edc
       
   360   |
       
   361   | x  471597cad322
       
   362   |/     Obsfate: rewritten as 2:337fec4d2edc, 3:f257fde29c7a;
       
   363   o  ea207398892e
       
   364   
       
   365   $ hg fatelogjson --hidden
       
   366   @  f257fde29c7a
       
   367   |
       
   368   o  337fec4d2edc
       
   369   |
       
   370   | x  471597cad322
       
   371   |/     Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
       
   372   o  ea207398892e
       
   373   
   273 Test templates with folded commit
   374 Test templates with folded commit
   274 =================================
   375 =================================
   275 
   376 
   276 Test setup
   377 Test setup
   277 ----------
   378 ----------
   352   |/     Successors: 3:eb5a0daa2192
   453   |/     Successors: 3:eb5a0daa2192
   353   |      multi-line: 3:eb5a0daa2192
   454   |      multi-line: 3:eb5a0daa2192
   354   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   455   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   355   o  ea207398892e
   456   o  ea207398892e
   356   
   457   
       
   458 
       
   459   $ hg fatelog
       
   460   o  eb5a0daa2192
       
   461   |
       
   462   | @  471f378eab4c
       
   463   |/     Obsfate: rewritten as 3:eb5a0daa2192;
       
   464   o  ea207398892e
       
   465   
   357   $ hg up 'desc(B0)' --hidden
   466   $ hg up 'desc(B0)' --hidden
   358   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   467   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   359 
   468 
   360 Predecessors template should show both predecessors as they should be both
   469 Predecessors template should show both predecessors as they should be both
   361 displayed
   470 displayed
   371   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   480   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   372   | x  471f378eab4c
   481   | x  471f378eab4c
   373   |/     Successors: 3:eb5a0daa2192
   482   |/     Successors: 3:eb5a0daa2192
   374   |      multi-line: 3:eb5a0daa2192
   483   |      multi-line: 3:eb5a0daa2192
   375   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   484   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
       
   485   o  ea207398892e
       
   486   
       
   487 
       
   488   $ hg fatelog
       
   489   o  eb5a0daa2192
       
   490   |
       
   491   | @  0dec01379d3b
       
   492   | |    Obsfate: rewritten as 3:eb5a0daa2192;
       
   493   | x  471f378eab4c
       
   494   |/     Obsfate: rewritten as 3:eb5a0daa2192;
   376   o  ea207398892e
   495   o  ea207398892e
   377   
   496   
   378   $ hg up 'desc(C0)'
   497   $ hg up 'desc(C0)'
   379   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   498   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   380 
   499 
   399   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   518   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   400   | x  471f378eab4c
   519   | x  471f378eab4c
   401   |/     Successors: 3:eb5a0daa2192
   520   |/     Successors: 3:eb5a0daa2192
   402   |      multi-line: 3:eb5a0daa2192
   521   |      multi-line: 3:eb5a0daa2192
   403   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   522   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
       
   523   o  ea207398892e
       
   524   
       
   525 
       
   526   $ hg fatelog --hidden
       
   527   @  eb5a0daa2192
       
   528   |
       
   529   | x  0dec01379d3b
       
   530   | |    Obsfate: rewritten as 3:eb5a0daa2192;
       
   531   | x  471f378eab4c
       
   532   |/     Obsfate: rewritten as 3:eb5a0daa2192;
       
   533   o  ea207398892e
       
   534   
       
   535 
       
   536   $ hg fatelogjson --hidden
       
   537   @  eb5a0daa2192
       
   538   |
       
   539   | x  0dec01379d3b
       
   540   | |    Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
       
   541   | x  471f378eab4c
       
   542   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
   404   o  ea207398892e
   543   o  ea207398892e
   405   
   544   
   406 
   545 
   407 Test templates with divergence
   546 Test templates with divergence
   408 ==============================
   547 ==============================
   519   |      multi-line: 2:fdf9bde5129a
   658   |      multi-line: 2:fdf9bde5129a
   520   |      multi-line: 4:019fadeab383
   659   |      multi-line: 4:019fadeab383
   521   |      json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
   660   |      json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
   522   o  ea207398892e
   661   o  ea207398892e
   523   
   662   
       
   663   $ hg fatelog
       
   664   o  019fadeab383
       
   665   |
       
   666   | o  fdf9bde5129a
       
   667   |/
       
   668   | @  471f378eab4c
       
   669   |/     Obsfate: rewritten as 2:fdf9bde5129a; rewritten as 4:019fadeab383;
       
   670   o  ea207398892e
       
   671   
   524   $ hg up 'desc(A1)'
   672   $ hg up 'desc(A1)'
   525   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   673   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   526 
   674 
   527 Predecessors template should not show predecessors as they are not displayed in
   675 Predecessors template should not show predecessors as they are not displayed in
   528 the log
   676 the log
   529   $ hg tlog
   677   $ hg tlog
       
   678   o  019fadeab383
       
   679   |
       
   680   | @  fdf9bde5129a
       
   681   |/
       
   682   o  ea207398892e
       
   683   
       
   684 
       
   685   $ hg fatelog
   530   o  019fadeab383
   686   o  019fadeab383
   531   |
   687   |
   532   | @  fdf9bde5129a
   688   | @  fdf9bde5129a
   533   |/
   689   |/
   534   o  ea207398892e
   690   o  ea207398892e
   560   |      multi-line: 3:65b757b745b9
   716   |      multi-line: 3:65b757b745b9
   561   |      json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
   717   |      json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
   562   o  ea207398892e
   718   o  ea207398892e
   563   
   719   
   564 
   720 
       
   721   $ hg fatelog --hidden
       
   722   o  019fadeab383
       
   723   |
       
   724   | x  65b757b745b9
       
   725   |/     Obsfate: rewritten as 4:019fadeab383;
       
   726   | @  fdf9bde5129a
       
   727   |/
       
   728   | x  471f378eab4c
       
   729   |/     Obsfate: rewritten as 2:fdf9bde5129a; rewritten as 3:65b757b745b9;
       
   730   o  ea207398892e
       
   731   
       
   732 
       
   733   $ hg fatelogjson --hidden
       
   734   o  019fadeab383
       
   735   |
       
   736   | x  65b757b745b9
       
   737   |/     Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
       
   738   | @  fdf9bde5129a
       
   739   |/
       
   740   | x  471f378eab4c
       
   741   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
       
   742   o  ea207398892e
       
   743   
       
   744 
   565 Test templates with amended + folded commit
   745 Test templates with amended + folded commit
   566 ===========================================
   746 ===========================================
   567 
   747 
   568 Test setup
   748 Test setup
   569 ----------
   749 ----------
   657   |/     Successors: 4:eb5a0daa2192
   837   |/     Successors: 4:eb5a0daa2192
   658   |      multi-line: 4:eb5a0daa2192
   838   |      multi-line: 4:eb5a0daa2192
   659   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   839   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   660   o  ea207398892e
   840   o  ea207398892e
   661   
   841   
       
   842 
       
   843   $ hg fatelog
       
   844   o  eb5a0daa2192
       
   845   |
       
   846   | @  471f378eab4c
       
   847   |/     Obsfate: rewritten as 4:eb5a0daa2192;
       
   848   o  ea207398892e
       
   849   
   662   $ hg up 'desc(B0)' --hidden
   850   $ hg up 'desc(B0)' --hidden
   663   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   851   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   664 
   852 
   665 Predecessors template should both predecessors as they are visible
   853 Predecessors template should both predecessors as they are visible
   666   $ hg tlog
   854   $ hg tlog
   677   |/     Successors: 4:eb5a0daa2192
   865   |/     Successors: 4:eb5a0daa2192
   678   |      multi-line: 4:eb5a0daa2192
   866   |      multi-line: 4:eb5a0daa2192
   679   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   867   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   680   o  ea207398892e
   868   o  ea207398892e
   681   
   869   
       
   870 
       
   871   $ hg fatelog
       
   872   o  eb5a0daa2192
       
   873   |
       
   874   | @  0dec01379d3b
       
   875   | |    Obsfate: rewritten as 4:eb5a0daa2192;
       
   876   | x  471f378eab4c
       
   877   |/     Obsfate: rewritten as 4:eb5a0daa2192;
       
   878   o  ea207398892e
       
   879   
   682   $ hg up 'desc(B1)' --hidden
   880   $ hg up 'desc(B1)' --hidden
   683   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   881   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   684 
   882 
   685 Predecessors template should both predecessors as they are visible
   883 Predecessors template should both predecessors as they are visible
   686   $ hg tlog
   884   $ hg tlog
   697   |/     Successors: 4:eb5a0daa2192
   895   |/     Successors: 4:eb5a0daa2192
   698   |      multi-line: 4:eb5a0daa2192
   896   |      multi-line: 4:eb5a0daa2192
   699   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   897   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   700   o  ea207398892e
   898   o  ea207398892e
   701   
   899   
       
   900 
       
   901   $ hg fatelog
       
   902   o  eb5a0daa2192
       
   903   |
       
   904   | @  b7ea6d14e664
       
   905   | |    Obsfate: rewritten as 4:eb5a0daa2192;
       
   906   | x  471f378eab4c
       
   907   |/     Obsfate: rewritten as 4:eb5a0daa2192;
       
   908   o  ea207398892e
       
   909   
   702   $ hg up 'desc(C0)'
   910   $ hg up 'desc(C0)'
   703   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   911   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   704 
   912 
   705 Predecessors template should show no predecessors as they are both non visible
   913 Predecessors template should show no predecessors as they are both non visible
   706   $ hg tlog
   914   $ hg tlog
       
   915   @  eb5a0daa2192
       
   916   |
       
   917   o  ea207398892e
       
   918   
       
   919 
       
   920   $ hg fatelog
   707   @  eb5a0daa2192
   921   @  eb5a0daa2192
   708   |
   922   |
   709   o  ea207398892e
   923   o  ea207398892e
   710   
   924   
   711 Predecessors template should show all predecessors as we force their display
   925 Predecessors template should show all predecessors as we force their display
   733   |      multi-line: 4:eb5a0daa2192
   947   |      multi-line: 4:eb5a0daa2192
   734   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   948   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   735   o  ea207398892e
   949   o  ea207398892e
   736   
   950   
   737 
   951 
       
   952   $ hg fatelog --hidden
       
   953   @  eb5a0daa2192
       
   954   |
       
   955   | x  b7ea6d14e664
       
   956   | |    Obsfate: rewritten as 4:eb5a0daa2192;
       
   957   | | x  0dec01379d3b
       
   958   | |/     Obsfate: rewritten as 3:b7ea6d14e664;
       
   959   | x  471f378eab4c
       
   960   |/     Obsfate: rewritten as 4:eb5a0daa2192;
       
   961   o  ea207398892e
       
   962   
       
   963 
       
   964   $ hg fatelogjson --hidden
       
   965   @  eb5a0daa2192
       
   966   |
       
   967   | x  b7ea6d14e664
       
   968   | |    Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
       
   969   | | x  0dec01379d3b
       
   970   | |/     Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
       
   971   | x  471f378eab4c
       
   972   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
       
   973   o  ea207398892e
       
   974   
       
   975 
   738 Test template with pushed and pulled obs markers
   976 Test template with pushed and pulled obs markers
   739 ================================================
   977 ================================================
   740 
   978 
   741 Test setup
   979 Test setup
   742 ----------
   980 ----------
   836   |/     Successors: 2:7a230b46bf61
  1074   |/     Successors: 2:7a230b46bf61
   837   |      multi-line: 2:7a230b46bf61
  1075   |      multi-line: 2:7a230b46bf61
   838   |      json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
  1076   |      json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
   839   o  ea207398892e
  1077   o  ea207398892e
   840   
  1078   
       
  1079 
       
  1080   $ hg fatelog
       
  1081   o  7a230b46bf61
       
  1082   |
       
  1083   | @  471f378eab4c
       
  1084   |/     Obsfate: rewritten as 2:7a230b46bf61;
       
  1085   o  ea207398892e
       
  1086   
   841   $ hg up 'desc(A2)'
  1087   $ hg up 'desc(A2)'
   842   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1088   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   843 
  1089 
   844 Predecessors template should show no predecessors as they are non visible
  1090 Predecessors template should show no predecessors as they are non visible
   845   $ hg tlog
  1091   $ hg tlog
       
  1092   @  7a230b46bf61
       
  1093   |
       
  1094   o  ea207398892e
       
  1095   
       
  1096 
       
  1097   $ hg fatelog
   846   @  7a230b46bf61
  1098   @  7a230b46bf61
   847   |
  1099   |
   848   o  ea207398892e
  1100   o  ea207398892e
   849   
  1101   
   850 Predecessors template should show all predecessors as we force their display
  1102 Predecessors template should show all predecessors as we force their display
   857   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
  1109   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   858   | x  471f378eab4c
  1110   | x  471f378eab4c
   859   |/     Successors: 2:7a230b46bf61
  1111   |/     Successors: 2:7a230b46bf61
   860   |      multi-line: 2:7a230b46bf61
  1112   |      multi-line: 2:7a230b46bf61
   861   |      json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
  1113   |      json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
       
  1114   o  ea207398892e
       
  1115   
       
  1116 
       
  1117   $ hg fatelog --hidden
       
  1118   @  7a230b46bf61
       
  1119   |
       
  1120   | x  471f378eab4c
       
  1121   |/     Obsfate: rewritten as 2:7a230b46bf61;
   862   o  ea207398892e
  1122   o  ea207398892e
   863   
  1123   
   864 
  1124 
   865 Test template with obsmarkers cycle
  1125 Test template with obsmarkers cycle
   866 ===================================
  1126 ===================================
   888 
  1148 
   889 Check templates
  1149 Check templates
   890 ---------------
  1150 ---------------
   891 
  1151 
   892   $ hg tlog
  1152   $ hg tlog
       
  1153   @  f897c6137566
       
  1154   |
       
  1155   o  ea207398892e
       
  1156   
       
  1157 
       
  1158   $ hg fatelog
   893   @  f897c6137566
  1159   @  f897c6137566
   894   |
  1160   |
   895   o  ea207398892e
  1161   o  ea207398892e
   896   
  1162   
   897 
  1163 
   921   |      multi-line: 2:0dec01379d3b
  1187   |      multi-line: 2:0dec01379d3b
   922   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
  1188   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
   923   o  ea207398892e
  1189   o  ea207398892e
   924   
  1190   
   925 
  1191 
       
  1192   $ hg fatelog
       
  1193   o  f897c6137566
       
  1194   |
       
  1195   | @  0dec01379d3b
       
  1196   | |    Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c;
       
  1197   | x  471f378eab4c
       
  1198   |/     Obsfate: rewritten as 2:0dec01379d3b;
       
  1199   o  ea207398892e
       
  1200   
       
  1201 
   926   $ hg up -r "desc(A0)" --hidden
  1202   $ hg up -r "desc(A0)" --hidden
   927   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1203   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   928   $ hg tlog
  1204   $ hg tlog
   929   o  f897c6137566
  1205   o  f897c6137566
   930   |    Predecessors: 1:471f378eab4c
  1206   |    Predecessors: 1:471f378eab4c
   934   | @  471f378eab4c
  1210   | @  471f378eab4c
   935   |/
  1211   |/
   936   o  ea207398892e
  1212   o  ea207398892e
   937   
  1213   
   938 
  1214 
       
  1215   $ hg fatelog
       
  1216   o  f897c6137566
       
  1217   |
       
  1218   | @  471f378eab4c
       
  1219   |/
       
  1220   o  ea207398892e
       
  1221   
       
  1222 
   939   $ hg up -r "desc(ROOT)" --hidden
  1223   $ hg up -r "desc(ROOT)" --hidden
   940   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1224   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   941   $ hg tlog
  1225   $ hg tlog
       
  1226   o  f897c6137566
       
  1227   |
       
  1228   @  ea207398892e
       
  1229   
       
  1230 
       
  1231   $ hg fatelog
   942   o  f897c6137566
  1232   o  f897c6137566
   943   |
  1233   |
   944   @  ea207398892e
  1234   @  ea207398892e
   945   
  1235   
   946 
  1236 
  1145   | x  4a004186e638
  1435   | x  4a004186e638
  1146   |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
  1436   |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
  1147   |      multi-line: 8:b18bc8331526
  1437   |      multi-line: 8:b18bc8331526
  1148   |      multi-line: 9:0b997eb7ceee
  1438   |      multi-line: 9:0b997eb7ceee
  1149   |      json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
  1439   |      json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
       
  1440   o  dd800401bd8c
       
  1441   |
       
  1442   o  f897c6137566
       
  1443   |
       
  1444   o  ea207398892e
       
  1445   
       
  1446   $ hg fatelog
       
  1447   @  0b997eb7ceee
       
  1448   |
       
  1449   | o  b18bc8331526
       
  1450   |/
       
  1451   | o  ba2ed02b0c9a
       
  1452   | |
       
  1453   | x  4a004186e638
       
  1454   |/     Obsfate: rewritten as 8:b18bc8331526; rewritten as 9:0b997eb7ceee;
  1150   o  dd800401bd8c
  1455   o  dd800401bd8c
  1151   |
  1456   |
  1152   o  f897c6137566
  1457   o  f897c6137566
  1153   |
  1458   |
  1154   o  ea207398892e
  1459   o  ea207398892e
  1209   |      Successors: 2:0dec01379d3b
  1514   |      Successors: 2:0dec01379d3b
  1210   |      multi-line: 2:0dec01379d3b
  1515   |      multi-line: 2:0dec01379d3b
  1211   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
  1516   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
  1212   o  ea207398892e
  1517   o  ea207398892e
  1213   
  1518   
       
  1519   $ hg fatelog --hidden
       
  1520   @  0b997eb7ceee
       
  1521   |
       
  1522   | o  b18bc8331526
       
  1523   |/
       
  1524   | o  ba2ed02b0c9a
       
  1525   | |
       
  1526   | x  4a004186e638
       
  1527   |/     Obsfate: rewritten as 8:b18bc8331526; rewritten as 9:0b997eb7ceee;
       
  1528   o  dd800401bd8c
       
  1529   |
       
  1530   | x  9bd10a0775e4
       
  1531   |/     Obsfate: rewritten as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a;
       
  1532   o  f897c6137566
       
  1533   |
       
  1534   | x  0dec01379d3b
       
  1535   | |    Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c;
       
  1536   | x  471f378eab4c
       
  1537   |/     Obsfate: rewritten as 2:0dec01379d3b;
       
  1538   o  ea207398892e
       
  1539   
       
  1540   $ hg fatelogjson --hidden
       
  1541   @  0b997eb7ceee
       
  1542   |
       
  1543   | o  b18bc8331526
       
  1544   |/
       
  1545   | o  ba2ed02b0c9a
       
  1546   | |
       
  1547   | x  4a004186e638
       
  1548   |/     Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
       
  1549   o  dd800401bd8c
       
  1550   |
       
  1551   | x  9bd10a0775e4
       
  1552   |/     Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
       
  1553   o  f897c6137566
       
  1554   |
       
  1555   | x  0dec01379d3b
       
  1556   | |    Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
       
  1557   | x  471f378eab4c
       
  1558   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
       
  1559   o  ea207398892e
       
  1560   
  1214   $ hg up --hidden 4
  1561   $ hg up --hidden 4
  1215   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1562   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1216   $ hg rebase -r 7 -d 8 --config extensions.rebase=
  1563   $ hg rebase -r 7 -d 8 --config extensions.rebase=
  1217   rebasing 7:ba2ed02b0c9a "Add A,B,C"
  1564   rebasing 7:ba2ed02b0c9a "Add A,B,C"
  1218   $ hg tlog
  1565   $ hg tlog
  1243   |      json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
  1590   |      json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
  1244   o  f897c6137566
  1591   o  f897c6137566
  1245   |
  1592   |
  1246   o  ea207398892e
  1593   o  ea207398892e
  1247   
  1594   
       
  1595 
       
  1596   $ hg fatelog
       
  1597   o  eceed8f98ffc
       
  1598   |
       
  1599   | o  0b997eb7ceee
       
  1600   | |
       
  1601   o |  b18bc8331526
       
  1602   |/
       
  1603   o  dd800401bd8c
       
  1604   |
       
  1605   | @  9bd10a0775e4
       
  1606   |/     Obsfate: rewritten as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; rewritten as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc;
       
  1607   o  f897c6137566
       
  1608   |
       
  1609   o  ea207398892e
       
  1610   
  1248 Test templates with pruned commits
  1611 Test templates with pruned commits
  1249 ==================================
  1612 ==================================
  1250 
  1613 
  1251 Test setup
  1614 Test setup
  1252 ----------
  1615 ----------
  1266   $ hg tlog
  1629   $ hg tlog
  1267   @  471f378eab4c
  1630   @  471f378eab4c
  1268   |
  1631   |
  1269   o  ea207398892e
  1632   o  ea207398892e
  1270   
  1633   
       
  1634   $ hg fatelog
       
  1635   @  471f378eab4c
       
  1636   |
       
  1637   o  ea207398892e
       
  1638   
       
  1639   $ hg fatelog -v
       
  1640   @  471f378eab4c
       
  1641   |
       
  1642   o  ea207398892e
       
  1643