Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-obshistory.t
changeset 3055 774b4ea6ca58
parent 3054 bc890c6c9b2f
child 3075 8feb2cae7eae
equal deleted inserted replaced
3054:bc890c6c9b2f 3055:774b4ea6ca58 
   237 -----------
 
   237 -----------
 
   238 
   238 
   239   $ hg obslog 'desc(B0)' --hidden --patch
 
   239   $ hg obslog 'desc(B0)' --hidden --patch
 
   240   x  0dec01379d3b (2) B0
 
   240   x  0dec01379d3b (2) B0
 
   241        pruned by test (*) (glob)
 
   241        pruned by test (*) (glob)
 
   242          (No patch available yet, no successors)
 
   242          (No patch available, no successors)
 
   243   
   243   
   244   $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
 
   244   $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
 
   245   [
 
   245   [
 
   246       {
 
   246       {
 
   247           "markers": [
 
   247           "markers": [
 
   372 
   372 
   373 Check that debugobshistory on splitted commit show both targets
 
   373 Check that debugobshistory on splitted commit show both targets
 
   374   $ hg obslog 471597cad322 --hidden --patch
 
   374   $ hg obslog 471597cad322 --hidden --patch
 
   375   x  471597cad322 (1) A0
 
   375   x  471597cad322 (1) A0
 
   376        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   376        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   377          (No patch available yet, too many successors (2))
 
   377          (No patch available, too many successors (2))
 
   378   
   378   
   379   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
 
   379   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
 
   380   [
 
   380   [
 
   381       {
 
   381       {
 
   382           "markers": [
 
   382           "markers": [
 
   407   $ hg obslog 337fec4d2edc --patch
 
   407   $ hg obslog 337fec4d2edc --patch
 
   408   o  337fec4d2edc (2) A0
 
   408   o  337fec4d2edc (2) A0
 
   409   |
 
   409   |
 
   410   x  471597cad322 (1) A0
 
   410   x  471597cad322 (1) A0
 
   411        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   411        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   412          (No patch available yet, too many successors (2))
 
   412          (No patch available, too many successors (2))
 
   413   
   413   
   414 With the all option, it should show the three changesets
 
   414 With the all option, it should show the three changesets
 
   415   $ hg obslog --all 337fec4d2edc --patch
 
   415   $ hg obslog --all 337fec4d2edc --patch
 
   416   o  337fec4d2edc (2) A0
 
   416   o  337fec4d2edc (2) A0
 
   417   |
 
   417   |
 
   418   | @  f257fde29c7a (3) A0
 
   418   | @  f257fde29c7a (3) A0
 
   419   |/
 
   419   |/
 
   420   x  471597cad322 (1) A0
 
   420   x  471597cad322 (1) A0
 
   421        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   421        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   422          (No patch available yet, too many successors (2))
 
   422          (No patch available, too many successors (2))
 
   423   
   423   
   424 Check that debugobshistory on the second successor after split show
 
   424 Check that debugobshistory on the second successor after split show
 
   425 the revision plus the splitted one
 
   425 the revision plus the splitted one
 
   426   $ hg obslog f257fde29c7a --patch
 
   426   $ hg obslog f257fde29c7a --patch
 
   427   @  f257fde29c7a (3) A0
 
   427   @  f257fde29c7a (3) A0
 
   428   |
 
   428   |
 
   429   x  471597cad322 (1) A0
 
   429   x  471597cad322 (1) A0
 
   430        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   430        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   431          (No patch available yet, too many successors (2))
 
   431          (No patch available, too many successors (2))
 
   432   
   432   
   433 With the all option, it should show the three changesets
 
   433 With the all option, it should show the three changesets
 
   434   $ hg obslog f257fde29c7a --all --patch
 
   434   $ hg obslog f257fde29c7a --all --patch
 
   435   o  337fec4d2edc (2) A0
 
   435   o  337fec4d2edc (2) A0
 
   436   |
 
   436   |
 
   437   | @  f257fde29c7a (3) A0
 
   437   | @  f257fde29c7a (3) A0
 
   438   |/
 
   438   |/
 
   439   x  471597cad322 (1) A0
 
   439   x  471597cad322 (1) A0
 
   440        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   440        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   441          (No patch available yet, too many successors (2))
 
   441          (No patch available, too many successors (2))
 
   442   
   442   
   443 Obslog with all option all should also works on the splitted commit
 
   443 Obslog with all option all should also works on the splitted commit
 
   444   $ hg obslog -a 471597cad322 --hidden --patch
 
   444   $ hg obslog -a 471597cad322 --hidden --patch
 
   445   o  337fec4d2edc (2) A0
 
   445   o  337fec4d2edc (2) A0
 
   446   |
 
   446   |
 
   447   | @  f257fde29c7a (3) A0
 
   447   | @  f257fde29c7a (3) A0
 
   448   |/
 
   448   |/
 
   449   x  471597cad322 (1) A0
 
   449   x  471597cad322 (1) A0
 
   450        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   450        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   451          (No patch available yet, too many successors (2))
 
   451          (No patch available, too many successors (2))
 
   452   
   452   
   453 Check that debugobshistory on both successors after split show
 
   453 Check that debugobshistory on both successors after split show
 
   454 a coherent graph
 
   454 a coherent graph
 
   455   $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch
 
   455   $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch
 
   456   o  337fec4d2edc (2) A0
 
   456   o  337fec4d2edc (2) A0
 
   457   |
 
   457   |
 
   458   | @  f257fde29c7a (3) A0
 
   458   | @  f257fde29c7a (3) A0
 
   459   |/
 
   459   |/
 
   460   x  471597cad322 (1) A0
 
   460   x  471597cad322 (1) A0
 
   461        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   461        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
 
   462          (No patch available yet, too many successors (2))
 
   462          (No patch available, too many successors (2))
 
   463   
   463   
   464   $ hg update 471597cad322
 
   464   $ hg update 471597cad322
 
   465   abort: hidden revision '471597cad322'!
 
   465   abort: hidden revision '471597cad322'!
 
   466   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
 
   466   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
 
   467   [255]
 
   467   [255]
 
   625 -----------
 
   625 -----------
 
   626 
   626 
   627   $ hg obslog de7290d8b885 --hidden --patch
 
   627   $ hg obslog de7290d8b885 --hidden --patch
 
   628   x  de7290d8b885 (1) A0
 
   628   x  de7290d8b885 (1) A0
 
   629        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   629        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   630          (No patch available yet, too many successors (4))
 
   630          (No patch available, too many successors (4))
 
   631   
   631   
   632   $ hg obslog de7290d8b885 --hidden --all --patch
 
   632   $ hg obslog de7290d8b885 --hidden --all --patch
 
   633   o  1ae8bc733a14 (4) A0
 
   633   o  1ae8bc733a14 (4) A0
 
   634   |
 
   634   |
 
   635   | o  337fec4d2edc (2) A0
 
   635   | o  337fec4d2edc (2) A0
 
   638   |/
 
   638   |/
 
   639   | o  f257fde29c7a (3) A0
 
   639   | o  f257fde29c7a (3) A0
 
   640   |/
 
   640   |/
 
   641   x  de7290d8b885 (1) A0
 
   641   x  de7290d8b885 (1) A0
 
   642        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   642        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   643          (No patch available yet, too many successors (4))
 
   643          (No patch available, too many successors (4))
 
   644   
   644   
   645   $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
 
   645   $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
 
   646   [
 
   646   [
 
   647       {
 
   647       {
 
   648           "markers": [
 
   648           "markers": [
 
   673   $ hg obslog c7f044602e9b --patch
 
   673   $ hg obslog c7f044602e9b --patch
 
   674   @  c7f044602e9b (5) A0
 
   674   @  c7f044602e9b (5) A0
 
   675   |
 
   675   |
 
   676   x  de7290d8b885 (1) A0
 
   676   x  de7290d8b885 (1) A0
 
   677        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   677        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   678          (No patch available yet, too many successors (4))
 
   678          (No patch available, too many successors (4))
 
   679   
   679   
   680   $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
 
   680   $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
 
   681   [
 
   681   [
 
   682       {
 
   682       {
 
   683           "markers": [],
 
   683           "markers": [],
 
   721   |/
 
   721   |/
 
   722   | o  f257fde29c7a (3) A0
 
   722   | o  f257fde29c7a (3) A0
 
   723   |/
 
   723   |/
 
   724   x  de7290d8b885 (1) A0
 
   724   x  de7290d8b885 (1) A0
 
   725        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   725        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   726          (No patch available yet, too many successors (4))
 
   726          (No patch available, too many successors (4))
 
   727   
   727   
   728   $ hg obslog 5 --all --patch
 
   728   $ hg obslog 5 --all --patch
 
   729   o  1ae8bc733a14 (4) A0
 
   729   o  1ae8bc733a14 (4) A0
 
   730   |
 
   730   |
 
   731   | o  337fec4d2edc (2) A0
 
   731   | o  337fec4d2edc (2) A0
 
   734   |/
 
   734   |/
 
   735   | o  f257fde29c7a (3) A0
 
   735   | o  f257fde29c7a (3) A0
 
   736   |/
 
   736   |/
 
   737   x  de7290d8b885 (1) A0
 
   737   x  de7290d8b885 (1) A0
 
   738        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   738        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
 
   739          (No patch available yet, too many successors (4))
 
   739          (No patch available, too many successors (4))
 
   740   
   740   
   741   $ hg update de7290d8b885
 
   741   $ hg update de7290d8b885
 
   742   abort: hidden revision 'de7290d8b885'!
 
   742   abort: hidden revision 'de7290d8b885'!
 
   743   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
 
   743   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
 
   744   [255]
 
   744   [255]
 
   828   $ hg obslog --hidden --all 471f378eab4c --patch
 
   828   $ hg obslog --hidden --all 471f378eab4c --patch
 
   829   @    eb5a0daa2192 (3) C0
 
   829   @    eb5a0daa2192 (3) C0
 
   830   |\
 
   830   |\
 
   831   x |  0dec01379d3b (2) B0
 
   831   x |  0dec01379d3b (2) B0
 
   832    /     rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   832    /     rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   833   |        (No patch available yet, changesets rebased)
 
   833   |        (No patch available, changesets rebased)
 
   834   |
 
   834   |
 
   835   x  471f378eab4c (1) A0
 
   835   x  471f378eab4c (1) A0
 
   836        rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
 
   836        rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
 
   837          --- a/471f378eab4c-changeset-description
 
   837          --- a/471f378eab4c-changeset-description
 
   838          +++ b/eb5a0daa2192-changeset-description
 
   838          +++ b/eb5a0daa2192-changeset-description
 
   850 Check that debugobshistory on the second folded revision show only
 
   850 Check that debugobshistory on the second folded revision show only
 
   851 the revision with the target
 
   851 the revision with the target
 
   852   $ hg obslog --hidden 0dec01379d3b --patch
 
   852   $ hg obslog --hidden 0dec01379d3b --patch
 
   853   x  0dec01379d3b (2) B0
 
   853   x  0dec01379d3b (2) B0
 
   854        rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   854        rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   855          (No patch available yet, changesets rebased)
 
   855          (No patch available, changesets rebased)
 
   856   
   856   
   857 Check that with all option, all changesets are shown
 
   857 Check that with all option, all changesets are shown
 
   858   $ hg obslog --hidden --all 0dec01379d3b --patch
 
   858   $ hg obslog --hidden --all 0dec01379d3b --patch
 
   859   @    eb5a0daa2192 (3) C0
 
   859   @    eb5a0daa2192 (3) C0
 
   860   |\
 
   860   |\
 
   861   x |  0dec01379d3b (2) B0
 
   861   x |  0dec01379d3b (2) B0
 
   862    /     rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   862    /     rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   863   |        (No patch available yet, changesets rebased)
 
   863   |        (No patch available, changesets rebased)
 
   864   |
 
   864   |
 
   865   x  471f378eab4c (1) A0
 
   865   x  471f378eab4c (1) A0
 
   866        rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
 
   866        rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
 
   867          --- a/471f378eab4c-changeset-description
 
   867          --- a/471f378eab4c-changeset-description
 
   868          +++ b/eb5a0daa2192-changeset-description
 
   868          +++ b/eb5a0daa2192-changeset-description
 
   882   $ hg obslog eb5a0daa2192 --patch
 
   882   $ hg obslog eb5a0daa2192 --patch
 
   883   @    eb5a0daa2192 (3) C0
 
   883   @    eb5a0daa2192 (3) C0
 
   884   |\
 
   884   |\
 
   885   x |  0dec01379d3b (2) B0
 
   885   x |  0dec01379d3b (2) B0
 
   886    /     rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   886    /     rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
   887   |        (No patch available yet, changesets rebased)
 
   887   |        (No patch available, changesets rebased)
 
   888   |
 
   888   |
 
   889   x  471f378eab4c (1) A0
 
   889   x  471f378eab4c (1) A0
 
   890        rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
 
   890        rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
 
   891          --- a/471f378eab4c-changeset-description
 
   891          --- a/471f378eab4c-changeset-description
 
   892          +++ b/eb5a0daa2192-changeset-description
 
   892          +++ b/eb5a0daa2192-changeset-description
 
  1382   |        +B0
 
  1382   |        +B0
 
  1383   |
 
  1383   |
 
  1384   |
 
  1384   |
 
  1385   x  b7ea6d14e664 (3) B1
 
  1385   x  b7ea6d14e664 (3) B1
 
  1386   |    rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
  1386   |    rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
  1387   |      (No patch available yet, changesets rebased)
 
  1387   |      (No patch available, changesets rebased)
 
  1388   |
 
  1388   |
 
  1389   x  0dec01379d3b (2) B0
 
  1389   x  0dec01379d3b (2) B0
 
  1390        rewritten(description) as b7ea6d14e664 by test (*) (glob)
 
  1390        rewritten(description) as b7ea6d14e664 by test (*) (glob)
 
  1391          --- a/0dec01379d3b-changeset-description
 
  1391          --- a/0dec01379d3b-changeset-description
 
  1392          +++ b/b7ea6d14e664-changeset-description
 
  1392          +++ b/b7ea6d14e664-changeset-description
 
  1414   |        +B0
 
  1414   |        +B0
 
  1415   |
 
  1415   |
 
  1416   |
 
  1416   |
 
  1417   x  b7ea6d14e664 (3) B1
 
  1417   x  b7ea6d14e664 (3) B1
 
  1418   |    rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
  1418   |    rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
 
  1419   |      (No patch available yet, changesets rebased)
 
  1419   |      (No patch available, changesets rebased)
 
  1420   |
 
  1420   |
 
  1421   x  0dec01379d3b (2) B0
 
  1421   x  0dec01379d3b (2) B0
 
  1422        rewritten(description) as b7ea6d14e664 by test (*) (glob)
 
  1422        rewritten(description) as b7ea6d14e664 by test (*) (glob)
 
  1423          --- a/0dec01379d3b-changeset-description
 
  1423          --- a/0dec01379d3b-changeset-description
 
  1424          +++ b/b7ea6d14e664-changeset-description
 
  1424          +++ b/b7ea6d14e664-changeset-description
 
  1632   $ hg obslog 7a230b46bf61 --patch
 
  1632   $ hg obslog 7a230b46bf61 --patch
 
  1633   o  7a230b46bf61 (2) A2
 
  1633   o  7a230b46bf61 (2) A2
 
  1634   |
 
  1634   |
 
  1635   x  fdf9bde5129a
 
  1635   x  fdf9bde5129a
 
  1636   |    rewritten(description) as 7a230b46bf61 by test (*) (glob)
 
  1636   |    rewritten(description) as 7a230b46bf61 by test (*) (glob)
 
  1637   |      (No patch available yet, context is not local)
 
  1637   |      (No patch available, context is not local)
 
  1638   |
 
  1638   |
 
  1639   @  471f378eab4c (1) A0
 
  1639   @  471f378eab4c (1) A0
 
  1640        rewritten(description) as fdf9bde5129a by test (*) (glob)
 
  1640        rewritten(description) as fdf9bde5129a by test (*) (glob)
 
  1641          (No patch available yet, successor is unknown locally)
 
  1641          (No patch available, successor is unknown locally)
 
  1642   
  1642   
  1643   $ hg obslog 7a230b46bf61 --color=debug --patch
 
  1643   $ hg obslog 7a230b46bf61 --color=debug --patch
 
  1644   o  [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
 
  1644   o  [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
 
  1645   |
 
  1645   |
 
  1646   x  [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
 
  1646   x  [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
 
  1647   |    [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob)
 
  1647   |    [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob)
 
  1648   |      (No patch available yet, context is not local)
 
  1648   |      (No patch available, context is not local)
 
  1649   |
 
  1649   |
 
  1650   @  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
  1650   @  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
  1651        [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob)
 
  1651        [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob)
 
  1652          (No patch available yet, successor is unknown locally)
 
  1652          (No patch available, successor is unknown locally)
 
  1653   
  1653
evolve