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-complex.t
branchmercurial-5.0
changeset 5364 be5aa681c122
parent 5159 e5fe3ca5e6ad
parent 5349 e8660b28bfee
child 5367 cb5983c0287f
equal deleted inserted replaced
5280:90fbbc29b93a 5364:be5aa681c122 
       
     1 Testing obslog and other commands accessing obsolete revisions.
 
       
     2 
     1 Global setup
 
     3 Global setup
 
     2 ============
 
     4 ============
 
     3 
     5 
     4   $ . $TESTDIR/testlib/common.sh
 
     6   $ . $TESTDIR/testlib/obshistory_setup.sh
 
     5   $ cat >> $HGRCPATH <<EOF
 
       
     6   > [ui]
 
       
     7   > interactive = true
 
       
     8   > [phases]
 
       
     9   > publish=False
 
       
    10   > [extensions]
 
       
    11   > evolve =
 
       
    12   > EOF
 
       
    13 
     7 
    14 Test obslog with split + fold + split
 
     8 Test obslog with split + fold + split
 
    15 =====================================
 
     9 =====================================
 
    16 
    10 
    17 Test setup
 
    11 Test setup
 
    74   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
 
    68   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
 
    75   2 changesets folded
 
    69   2 changesets folded
 
    76   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    70   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    77   $ hg obslog -r .
 
    71   $ hg obslog -r .
 
    78   @    100cc25b765f (9) fold2
 
    72   @    100cc25b765f (9) fold2
 
    79   |\
 
    73   |\     folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
    74   | |      note: folding changesets to test
 
       
    75   | |
 
    80   x |  0da815c333f6 (5) E
 
    76   x |  0da815c333f6 (5) E
 
    81    /     folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
    77    /
 
    82   |        note: folding changesets to test
 
       
    83   |
 
       
    84   x  d9f908fde1a1 (6) F
 
    78   x  d9f908fde1a1 (6) F
 
    85        folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
    86          note: folding changesets to test
 
       
    87   
    79   
    88   $ hg log -G 
    80   $ hg log -G 
    89   @  changeset:   9:100cc25b765f
 
    81   @  changeset:   9:100cc25b765f
 
    90   |  tag:         tip
 
    82   |  tag:         tip
 
    91   |  parent:      4:868d2e0eb19c
 
    83   |  parent:      4:868d2e0eb19c
 
   378      summary:     ROOT
 
   370      summary:     ROOT
 
   379   
   371   
   380 Actual Test
 
   372 Actual Test
 
   381 ===========
 
   373 ===========
 
   382 
   374 
   383 Obslog should show a subset of the obs history, this test check that the
 
   375 Obslog should show a subset of the obs history, this test checks that the
 
   384 walking algorithm works no matter the level of successors + precursors
 
   376 walking algorithm works no matter the level of successors + precursors
 
   385 
   377 
   386   $ hg obslog 12
 
   378   $ hg obslog 12
 
       
   379   *    7b3290f6e0a0 (12) fold1
 
       
   380   |\     split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   381   | |    rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   382   | |
 
       
   383   x |    d15d0ffc75f6 (8) fold1
 
       
   384   |\ \     folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   385   | | |
 
       
   386   | | x  e036916b63ea (11) fold0
 
       
   387   | | |    split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   388   | | |
 
       
   389   x | |  868d2e0eb19c (4) D
 
       
   390    / /
 
       
   391   x /  a8df460dbbfe (3) C
 
       
   392    /
 
       
   393   x    b868bc49b0a4 (7) fold0
 
       
   394   |\     folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   395   | |
 
       
   396   x |  2a34000d3544 (1) A
 
       
   397    /
 
       
   398   x  c473644ee0e9 (2) B
 
       
   399   
       
   400 
       
   401   $ hg obslog 12 --no-origin
 
   387   *    7b3290f6e0a0 (12) fold1
 
   402   *    7b3290f6e0a0 (12) fold1
 
   388   |\
 
   403   |\
 
   389   x |    d15d0ffc75f6 (8) fold1
 
   404   x |    d15d0ffc75f6 (8) fold1
 
   390   |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   405   |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   391   | | |
 
   406   | | |
 
   409   
   424   
   410 While with all option, we should see 15 changesets
 
   425 While with all option, we should see 15 changesets
 
   411 
   426 
   412   $ hg obslog --all 15
 
   427   $ hg obslog --all 15
 
   413   o  19e14c8397fc (10) fold0
 
   428   o  19e14c8397fc (10) fold0
 
       
   429   |    split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   414   |
 
   430   |
 
   415   | *    7b3290f6e0a0 (12) fold1
 
   431   | *    7b3290f6e0a0 (12) fold1
 
   416   | |\
 
   432   | |\     split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   433   | | |    rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   434   | | |
 
   417   | | | @  d4a000f63ee9 (15) fold2
 
   435   | | | @  d4a000f63ee9 (15) fold2
 
       
   436   | | | |    split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   418   | | | |
 
   437   | | | |
 
   419   | | | | *  ec31316faa9d (14) fold2
 
   438   | | | | *  ec31316faa9d (14) fold2
 
   420   | | | |/|
 
   439   | | | |/|    split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   440   | | | | |    rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   441   | | | | |      note: this is a note stored in obsmarker in prune
 
       
   442   | | | | |
 
   421   | | | x |    100cc25b765f (9) fold2
 
   443   | | | x |    100cc25b765f (9) fold2
 
   422   | | | |\ \     split(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   444   | | | |\ \     folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   445   | | | | | |      note: folding changesets to test
 
   423   | | | | | |
 
   446   | | | | | |
 
   424   | +-------x  d0f33db50670 (13) fold1
 
   447   | +-------x  d0f33db50670 (13) fold1
 
   425   | | | | |      rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   448   | | | | |      split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   426   | | | | |        note: this is a note stored in obsmarker in prune
 
       
   427   | | | | |
 
   449   | | | | |
 
   428   +---x | |  e036916b63ea (11) fold0
 
   450   +---x | |  e036916b63ea (11) fold0
 
   429   | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
 
   451   | |  / /     split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   430   | | | |
 
   452   | | | |
 
   431   | | x |  0da815c333f6 (5) E
 
   453   | | x /  0da815c333f6 (5) E
 
   432   | |  /     folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   454   | |  /
 
   433   | | |        note: folding changesets to test
 
       
   434   | | |
 
       
   435   x | |    b868bc49b0a4 (7) fold0
 
   455   x | |    b868bc49b0a4 (7) fold0
 
   436   |\ \ \     split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   456   |\ \ \     folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   437   | | | |
 
   457   | | | |
 
   438   | | x |    d15d0ffc75f6 (8) fold1
 
   458   | | x |    d15d0ffc75f6 (8) fold1
 
   439   | | |\ \     split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
 
   459   | | |\ \     folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   440   | | | | |
 
   460   | | | | |
 
   441   | | | | x  d9f908fde1a1 (6) F
 
   461   | | | | x  d9f908fde1a1 (6) F
 
   442   | | | |      folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   443   | | | |        note: folding changesets to test
 
       
   444   | | | |
 
   462   | | | |
 
   445   x | | |  2a34000d3544 (1) A
 
   463   x | | |  2a34000d3544 (1) A
 
   446    / / /     folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   464    / / /
 
   447   | | |
 
   465   | x /  868d2e0eb19c (4) D
 
   448   | x |  868d2e0eb19c (4) D
 
   466   |  /
 
   449   |  /     folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   450   | |
 
       
   451   | x  a8df460dbbfe (3) C
 
   467   | x  a8df460dbbfe (3) C
 
   452   |      folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   453   |
 
   468   |
 
   454   x  c473644ee0e9 (2) B
 
   469   x  c473644ee0e9 (2) B
 
   455        folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
 
   470   
   456
evolve