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-obsolete.t
changeset 2571 3f469be5f3a7
parent 2566 f6821f6bf73c
child 2587 cbc7a69116bd
equal deleted inserted replaced
2570:86959f2c625d 2571:3f469be5f3a7 
     6   > allow_push = *
 
     6   > allow_push = *
 
     7   > [phases]
 
     7   > [phases]
 
     8   > publish=False
 
     8   > publish=False
 
     9   > [alias]
 
     9   > [alias]
 
    10   > debugobsolete=debugobsolete -d '0 0'
 
    10   > debugobsolete=debugobsolete -d '0 0'
 
       
    11   > [experimental]
 
       
    12   > evolution.effect-flags = yes
 
    11   > [extensions]
 
    13   > [extensions]
 
    12   > hgext.rebase=
 
    14   > hgext.rebase=
 
    13   > EOF
 
    15   > EOF
 
    14   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
    16   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
    15   $ mkcommit() {
 
    17   $ mkcommit() {
 
    32   4538525df7e2b9f09423636c61ef63a4cb872a2d
 
    34   4538525df7e2b9f09423636c61ef63a4cb872a2d
 
    33   $ getid 3
 
    35   $ getid 3
 
    34   0d3f46688ccc6e756c7e96cf64c391c411309597
 
    36   0d3f46688ccc6e756c7e96cf64c391c411309597
 
    35   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
 
    37   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
 
    36   $ hg debugobsolete
 
    38   $ hg debugobsolete
 
    37   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
    39   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
 
    38 
    40 
    39 
    41 
    40 Test hidden() revset
 
    42 Test hidden() revset
 
    41 
    43 
    42   $ qlog -r 'hidden()' --hidden
 
    44   $ qlog -r 'hidden()' --hidden
 
   638      user:        test
 
   640      user:        test
 
   639      date:        Thu Jan 01 00:00:00 1970 +0000
 
   641      date:        Thu Jan 01 00:00:00 1970 +0000
 
   640      summary:     add a
 
   642      summary:     add a
 
   641   
   643   
   642   $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
 
   644   $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
 
   643   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   645   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
 
   644   0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   646   0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (*) {'user': 'test'} (glob)
 
   645   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   647   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob)
 
   646   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   648   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob)
 
   647   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   649   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)
 
   648   1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   650   1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob)
 
   649   83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   651   83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob)
 
   650   0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'user': 'test'} (glob)
 
   652   0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
 
   651   159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'user': 'test'} (glob)
 
   653   159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'ef1': '*', 'user': 'test'} (glob)
 
   652   9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   654   9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (*) {'user': 'test'} (glob)
 
   653   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob)
 
   655   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
 
   654 #no produced by 2.3
 
   656 #no produced by 2.3
 
   655 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
 
   657 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
 
   656 
   658 
   657 Check divergence detection (note: multiple successors is sorted by changeset hash)
 
   659 Check divergence detection (note: multiple successors is sorted by changeset hash)
 
   658 
   660 
   692   [4] add obsol_c'
 
   694   [4] add obsol_c'
 
   693   [10] add obsol_c
 
   695   [10] add obsol_c
 
   694   [2]
 
   696   [2]
 
   695   $ hg olog
 
   697   $ hg olog
 
   696   @  0d3f46688ccc (3) add obsol_c
 
   698   @  0d3f46688ccc (3) add obsol_c
 
   697   |    rewritten by test (*) as 2033b4e49474 (glob)
 
   699   |    rewritten(parent) by test (*) as 2033b4e49474 (glob)
 
   698   |    rewritten by test (Thu Jan 01 00:00:00 1970 +0000) as 725c380fe99b
 
   700   |    rewritten by test (*) as 725c380fe99b (glob)
 
   699   |
 
   701   |
 
   700   x  4538525df7e2 (2) add c
 
   702   x  4538525df7e2 (2) add c
 
   701        rewritten by test (Thu Jan 01 00:00:00 1970 +0000) as 0d3f46688ccc
 
   703        rewritten by test (*) as 0d3f46688ccc (glob)
 
   702   
   704   
   703 
   705 
   704 Check import reports new unstable changeset:
 
   706 Check import reports new unstable changeset:
 
   705 
   707 
   706   $ hg up --hidden 2
 
   708   $ hg up --hidden 2
 
   825   
   827   
   826 
   828 
   827 Simple rewrite
 
   829 Simple rewrite
 
   828 
   830 
   829   $ hg  --hidden debugobsolete --rev 3
 
   831   $ hg  --hidden debugobsolete --rev 3
 
   830   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   832   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
 
   831 
   833 
   832 simple rewrite with a prune attached to it
 
   834 simple rewrite with a prune attached to it
 
   833 
   835 
   834   $ hg debugobsolete --rev 15
 
   836   $ hg debugobsolete --rev 15
 
   835   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob)
 
   837   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
 
   836   33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'user': 'test'} (glob)
 
   838   33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
 
   837 
   839 
   838 Transitive rewrite
 
   840 Transitive rewrite
 
   839 
   841 
   840   $ hg --hidden debugobsolete --rev 8
 
   842   $ hg --hidden debugobsolete --rev 8
 
   841   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   843   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)
 
   842   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   844   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob)
 
   843   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 
   845   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob)
 
   844 
   846
evolve