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-cycles.t
branchmercurial-4.3
changeset 3591 98941c28f3e2
parent 3566 e6bea259c227
parent 3106 a867d59ea97a
child 3592 7a5c3175015e
child 3716 e5ba6531503e
equal deleted inserted replaced
3590:d5adce52cef4 3591:98941c28f3e2 
    48      summary:     ROOT
 
    48      summary:     ROOT
 
    49   
    49   
    50 Create a cycle
 
    50 Create a cycle
 
    51   $ hg prune -s "desc(B)" "desc(A)"
 
    51   $ hg prune -s "desc(B)" "desc(A)"
 
    52   1 changesets pruned
 
    52   1 changesets pruned
 
    53   2 new orphan changesets
 
    53   2 new unstable changesets
 
    54   $ hg prune -s "desc(C)" "desc(B)"
 
    54   $ hg prune -s "desc(C)" "desc(B)"
 
    55   1 changesets pruned
 
    55   1 changesets pruned
 
    56   $ hg prune -s "desc(A)" "desc(C)"
 
    56   $ hg prune -s "desc(A)" "desc(C)"
 
    57   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
    57   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
    58   working directory now at 2a34000d3544
 
    58   working directory now at 2a34000d3544
 
    60   $ hg log --hidden -G
 
    60   $ hg log --hidden -G
 
    61   x  changeset:   3:a8df460dbbfe
 
    61   x  changeset:   3:a8df460dbbfe
 
    62   |  tag:         tip
 
    62   |  tag:         tip
 
    63   |  user:        test
 
    63   |  user:        test
 
    64   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    64   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    65   |  obsolete:    rewritten using prune as 1:2a34000d3544
 
    65   |  obsolete:    rewritten as 2a34000d3544
 
    66   |  summary:     C
 
    66   |  summary:     C
 
    67   |
 
    67   |
 
    68   x  changeset:   2:c473644ee0e9
 
    68   x  changeset:   2:c473644ee0e9
 
    69   |  user:        test
 
    69   |  user:        test
 
    70   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    70   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    71   |  obsolete:    rewritten using prune as 3:a8df460dbbfe
 
    71   |  obsolete:    rewritten as a8df460dbbfe
 
    72   |  summary:     B
 
    72   |  summary:     B
 
    73   |
 
    73   |
 
    74   @  changeset:   1:2a34000d3544
 
    74   @  changeset:   1:2a34000d3544
 
    75   |  user:        test
 
    75   |  user:        test
 
    76   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    76   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    77   |  obsolete:    rewritten using prune as 2:c473644ee0e9
 
    77   |  obsolete:    rewritten as c473644ee0e9
 
    78   |  summary:     A
 
    78   |  summary:     A
 
    79   |
 
    79   |
 
    80   o  changeset:   0:ea207398892e
 
    80   o  changeset:   0:ea207398892e
 
    81      user:        test
 
    81      user:        test
 
    82      date:        Thu Jan 01 00:00:00 1970 +0000
 
    82      date:        Thu Jan 01 00:00:00 1970 +0000
 
    87 
    87 
    88 Check that debugobshistory never crash on a cycle
 
    88 Check that debugobshistory never crash on a cycle
 
    89 
    89 
    90   $ hg obslog "desc(A)" --hidden
 
    90   $ hg obslog "desc(A)" --hidden
 
    91   @  2a34000d3544 (1) A
 
    91   @  2a34000d3544 (1) A
 
    92   |    rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
    92   |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
    93   |
 
    93   |
 
    94   x  a8df460dbbfe (3) C
 
    94   x  a8df460dbbfe (3) C
 
    95   |    rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
    95   |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
 
    96   |
 
    96   |
 
    97   x  c473644ee0e9 (2) B
 
    97   x  c473644ee0e9 (2) B
 
    98   |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
    98   |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
 
    99   |
 
    99   |
 
   100 
   100 
   101   $ hg obslog "desc(B)" --hidden
 
   101   $ hg obslog "desc(B)" --hidden
 
   102   @  2a34000d3544 (1) A
 
   102   @  2a34000d3544 (1) A
 
   103   |    rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   103   |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   104   |
 
   104   |
 
   105   x  a8df460dbbfe (3) C
 
   105   x  a8df460dbbfe (3) C
 
   106   |    rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   106   |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   107   |
 
   107   |
 
   108   x  c473644ee0e9 (2) B
 
   108   x  c473644ee0e9 (2) B
 
   109   |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   109   |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
 
   110   |
 
   110   |
 
   111 
   111 
   112   $ hg obslog "desc(C)" --hidden
 
   112   $ hg obslog "desc(C)" --hidden
 
   113   @  2a34000d3544 (1) A
 
   113   @  2a34000d3544 (1) A
 
   114   |    rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   114   |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   115   |
 
   115   |
 
   116   x  a8df460dbbfe (3) C
 
   116   x  a8df460dbbfe (3) C
 
   117   |    rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   117   |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   118   |
 
   118   |
 
   119   x  c473644ee0e9 (2) B
 
   119   x  c473644ee0e9 (2) B
 
   120   |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   120   |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
 
   121   |
 
   121   |
 
   122 
   122 
   123 Check that all option don't crash on a cycle either
 
   123 Check that all option don't crash on a cycle either
 
   124 
   124 
   125   $ hg obslog "desc(C)" --hidden --all
 
   125   $ hg obslog "desc(C)" --hidden --all
 
   126   @  2a34000d3544 (1) A
 
   126   @  2a34000d3544 (1) A
 
   127   |    rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   127   |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   128   |
 
   128   |
 
   129   x  a8df460dbbfe (3) C
 
   129   x  a8df460dbbfe (3) C
 
   130   |    rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   130   |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   131   |
 
   131   |
 
   132   x  c473644ee0e9 (2) B
 
   132   x  c473644ee0e9 (2) B
 
   133   |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   133   |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
 
   134   |
 
   134   |
 
   135 
   135 
   136 Test with multiple cyles
 
   136 Test with multiple cyles
 
   137 ========================
 
   137 ========================
 
   138 
   138 
   186      summary:     ROOT
 
   186      summary:     ROOT
 
   187   
   187   
   188 Create a first cycle
 
   188 Create a first cycle
 
   189   $ hg prune -s "desc(B)" "desc(A)"
 
   189   $ hg prune -s "desc(B)" "desc(A)"
 
   190   1 changesets pruned
 
   190   1 changesets pruned
 
   191   5 new orphan changesets
 
   191   5 new unstable changesets
 
   192   $ hg prune -s "desc(C)" "desc(B)"
 
   192   $ hg prune -s "desc(C)" "desc(B)"
 
   193   1 changesets pruned
 
   193   1 changesets pruned
 
   194   $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
 
   194   $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
 
   195   1 changesets pruned
 
   195   1 changesets pruned
 
   196 And create a second one
 
   196 And create a second one
 
   205   $ hg log --hidden -G
 
   205   $ hg log --hidden -G
 
   206   x  changeset:   6:d9f908fde1a1
 
   206   x  changeset:   6:d9f908fde1a1
 
   207   |  tag:         tip
 
   207   |  tag:         tip
 
   208   |  user:        test
 
   208   |  user:        test
 
   209   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   209   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   210   |  obsolete:    rewritten using prune as 4:868d2e0eb19c
 
   210   |  obsolete:    rewritten as 868d2e0eb19c
 
   211   |  summary:     F
 
   211   |  summary:     F
 
   212   |
 
   212   |
 
   213   x  changeset:   5:0da815c333f6
 
   213   x  changeset:   5:0da815c333f6
 
   214   |  user:        test
 
   214   |  user:        test
 
   215   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   215   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   216   |  obsolete:    rewritten using prune as 6:d9f908fde1a1
 
   216   |  obsolete:    rewritten as d9f908fde1a1
 
   217   |  summary:     E
 
   217   |  summary:     E
 
   218   |
 
   218   |
 
   219   @  changeset:   4:868d2e0eb19c
 
   219   @  changeset:   4:868d2e0eb19c
 
   220   |  user:        test
 
   220   |  user:        test
 
   221   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   221   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   222   |  obsolete:    rewritten using prune as 5:0da815c333f6
 
   222   |  obsolete:    rewritten as 0da815c333f6
 
   223   |  summary:     D
 
   223   |  summary:     D
 
   224   |
 
   224   |
 
   225   x  changeset:   3:a8df460dbbfe
 
   225   x  changeset:   3:a8df460dbbfe
 
   226   |  user:        test
 
   226   |  user:        test
 
   227   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   227   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   228   |  obsolete:    split using prune as 1:2a34000d3544, 4:868d2e0eb19c
 
   228   |  obsolete:    split as 2a34000d3544, 868d2e0eb19c
 
   229   |  summary:     C
 
   229   |  summary:     C
 
   230   |
 
   230   |
 
   231   x  changeset:   2:c473644ee0e9
 
   231   x  changeset:   2:c473644ee0e9
 
   232   |  user:        test
 
   232   |  user:        test
 
   233   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   233   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   234   |  obsolete:    rewritten using prune as 3:a8df460dbbfe
 
   234   |  obsolete:    rewritten as a8df460dbbfe
 
   235   |  summary:     B
 
   235   |  summary:     B
 
   236   |
 
   236   |
 
   237   x  changeset:   1:2a34000d3544
 
   237   x  changeset:   1:2a34000d3544
 
   238   |  user:        test
 
   238   |  user:        test
 
   239   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   239   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
   240   |  obsolete:    rewritten using prune as 2:c473644ee0e9
 
   240   |  obsolete:    rewritten as c473644ee0e9
 
   241   |  summary:     A
 
   241   |  summary:     A
 
   242   |
 
   242   |
 
   243   o  changeset:   0:ea207398892e
 
   243   o  changeset:   0:ea207398892e
 
   244      user:        test
 
   244      user:        test
 
   245      date:        Thu Jan 01 00:00:00 1970 +0000
 
   245      date:        Thu Jan 01 00:00:00 1970 +0000
 
   250 
   250 
   251 Check that debugobshistory never crash on a cycle
 
   251 Check that debugobshistory never crash on a cycle
 
   252 
   252 
   253   $ hg obslog "desc(D)" --hidden
 
   253   $ hg obslog "desc(D)" --hidden
 
   254   x  0da815c333f6 (5) E
 
   254   x  0da815c333f6 (5) E
 
   255   |    rewritten(description, parent, content) as d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   255   |    rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   256   |
 
   256   |
 
   257   @    868d2e0eb19c (4) D
 
   257   @    868d2e0eb19c (4) D
 
   258   |\     rewritten(description, parent, content) as 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   258   |\     rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   259   | |
 
   259   | |
 
   260   | x  d9f908fde1a1 (6) F
 
   260   | x  d9f908fde1a1 (6) F
 
   261   | |    rewritten(description, parent, content) as 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   261   | |    rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
 
   262   | |
 
   262   | |
 
   263   +---x  2a34000d3544 (1) A
 
   263   +---x  2a34000d3544 (1) A
 
   264   | |      rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   264   | |      rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   265   | |
 
   265   | |
 
   266   x |  a8df460dbbfe (3) C
 
   266   x |  a8df460dbbfe (3) C
 
   267   | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   267   | |    rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
 
   268   | |
 
   268   | |
 
   269   x |  c473644ee0e9 (2) B
 
   269   x |  c473644ee0e9 (2) B
 
   270   | |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   270   | |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
 
   271   | |
 
   271   | |
 
   272 Check that all option don't crash either on a cycle
 
   272 Check that all option don't crash either on a cycle
 
   273   $ hg obslog --all --hidden "desc(F)"
 
   273   $ hg obslog --all --hidden "desc(F)"
 
   274   x  0da815c333f6 (5) E
 
   274   x  0da815c333f6 (5) E
 
   275   |    rewritten(description, parent, content) as d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   275   |    rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   276   |
 
   276   |
 
   277   @    868d2e0eb19c (4) D
 
   277   @    868d2e0eb19c (4) D
 
   278   |\     rewritten(description, parent, content) as 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   278   |\     rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   279   | |
 
   279   | |
 
   280   | x  d9f908fde1a1 (6) F
 
   280   | x  d9f908fde1a1 (6) F
 
   281   | |    rewritten(description, parent, content) as 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   281   | |    rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
 
   282   | |
 
   282   | |
 
   283   +---x  2a34000d3544 (1) A
 
   283   +---x  2a34000d3544 (1) A
 
   284   | |      rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   284   | |      rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   285   | |
 
   285   | |
 
   286   x |  a8df460dbbfe (3) C
 
   286   x |  a8df460dbbfe (3) C
 
   287   | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   287   | |    rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
 
   288   | |
 
   288   | |
 
   289   x |  c473644ee0e9 (2) B
 
   289   x |  c473644ee0e9 (2) B
 
   290   | |    rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   290   | |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
 
   291   | |
 
   291   | |
 
   292 Check the json output is valid in this case
 
   292 Check the json output is valid in this case
 
   293 
   293 
   294   $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool
 
   294   $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool
 
   295   [
 
   295   [
 
   298               {
 
   298               {
 
   299                   "date": [
 
   299                   "date": [
 
   300                       *, (glob)
 
   300                       *, (glob)
 
   301                       0
 
   301                       0
 
   302                   ],
 
   302                   ],
 
   303                   "effect": [
 
       
   304                       "description",
 
       
   305                       "parent",
 
       
   306                       "content"
 
       
   307                   ],
 
       
   308                   "operation": "prune",
 
       
   309                   "succnodes": [
 
   303                   "succnodes": [
 
   310                       "0da815c333f6"
 
   304                       "0da815c333f6"
 
   311                   ],
 
   305                   ],
 
   312                   "user": "test",
 
   306                   "user": "test",
 
   313                   "verb": "rewritten"
 
   307                   "verb": "rewritten"
 
   322               {
 
   316               {
 
   323                   "date": [
 
   317                   "date": [
 
   324                       *, (glob)
 
   318                       *, (glob)
 
   325                       0
 
   319                       0
 
   326                   ],
 
   320                   ],
 
   327                   "effect": [
 
       
   328                       "description",
 
       
   329                       "parent",
 
       
   330                       "content"
 
       
   331                   ],
 
       
   332                   "operation": "prune",
 
       
   333                   "succnodes": [
 
   321                   "succnodes": [
 
   334                       "868d2e0eb19c"
 
   322                       "868d2e0eb19c"
 
   335                   ],
 
   323                   ],
 
   336                   "user": "test",
 
   324                   "user": "test",
 
   337                   "verb": "rewritten"
 
   325                   "verb": "rewritten"
 
   346               {
 
   334               {
 
   347                   "date": [
 
   335                   "date": [
 
   348                       *, (glob)
 
   336                       *, (glob)
 
   349                       0
 
   337                       0
 
   350                   ],
 
   338                   ],
 
   351                   "effect": [
 
       
   352                       "description",
 
       
   353                       "parent",
 
       
   354                       "content"
 
       
   355                   ],
 
       
   356                   "operation": "prune",
 
       
   357                   "succnodes": [
 
   339                   "succnodes": [
 
   358                       "d9f908fde1a1"
 
   340                       "d9f908fde1a1"
 
   359                   ],
 
   341                   ],
 
   360                   "user": "test",
 
   342                   "user": "test",
 
   361                   "verb": "rewritten"
 
   343                   "verb": "rewritten"
 
   370               {
 
   352               {
 
   371                   "date": [
 
   353                   "date": [
 
   372                       *, (glob)
 
   354                       *, (glob)
 
   373                       0
 
   355                       0
 
   374                   ],
 
   356                   ],
 
   375                   "effect": [
 
       
   376                       "description",
 
       
   377                       "parent",
 
       
   378                       "content"
 
       
   379                   ],
 
       
   380                   "operation": "prune",
 
       
   381                   "succnodes": [
 
   357                   "succnodes": [
 
   382                       "2a34000d3544",
 
   358                       "2a34000d3544",
 
   383                       "868d2e0eb19c"
 
   359                       "868d2e0eb19c"
 
   384                   ],
 
   360                   ],
 
   385                   "user": "test",
 
   361                   "user": "test",
 
   395               {
 
   371               {
 
   396                   "date": [
 
   372                   "date": [
 
   397                       *, (glob)
 
   373                       *, (glob)
 
   398                       0
 
   374                       0
 
   399                   ],
 
   375                   ],
 
   400                   "effect": [
 
       
   401                       "description",
 
       
   402                       "parent",
 
       
   403                       "content"
 
       
   404                   ],
 
       
   405                   "operation": "prune",
 
       
   406                   "succnodes": [
 
   376                   "succnodes": [
 
   407                       "a8df460dbbfe"
 
   377                       "a8df460dbbfe"
 
   408                   ],
 
   378                   ],
 
   409                   "user": "test",
 
   379                   "user": "test",
 
   410                   "verb": "rewritten"
 
   380                   "verb": "rewritten"
 
   419               {
 
   389               {
 
   420                   "date": [
 
   390                   "date": [
 
   421                       *, (glob)
 
   391                       *, (glob)
 
   422                       0
 
   392                       0
 
   423                   ],
 
   393                   ],
 
   424                   "effect": [
 
       
   425                       "description",
 
       
   426                       "parent",
 
       
   427                       "content"
 
       
   428                   ],
 
       
   429                   "operation": "prune",
 
       
   430                   "succnodes": [
 
   394                   "succnodes": [
 
   431                       "c473644ee0e9"
 
   395                       "c473644ee0e9"
 
   432                   ],
 
   396                   ],
 
   433                   "user": "test",
 
   397                   "user": "test",
 
   434                   "verb": "rewritten"
 
   398                   "verb": "rewritten"
evolve