Mercurial Mercurial > hg / annotate
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/bundles/rebase.sh
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 02 Oct 2019 18:16:02 -0400
changeset 43297 8a2925265402
parent 20832 5d57b2101ab1
permissions -rwxr-xr-x
sidedatacopies: fast path data fetching if revision has no sidedata When using the side data mode, we know their won't be any copy information sidedata. Skipping revision restoration give an important speed boost. In the future, there will be other user of sidedata, reducing the efficiency of this. We should consider adding a dedicated flag in revlog V2 to preserve this optimisation. The current situation is good enough for now. revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29 before: ! wall 2.401569 comb 2.400000 user 2.390000 sys 0.010000 (median of 10) after: ! wall 1.429294 comb 1.430000 user 1.410000 sys 0.020000 (median of 10) revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2 before: ! wall 3.519140 comb 3.520000 user 3.470000 sys 0.050000 (median of 10) after: ! wall 1.963332 comb 1.960000 user 1.960000 sys 0.000000 (median of 10) revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0 before: ! wall 0.593880 comb 0.600000 user 0.590000 sys 0.010000 (median of 15) after: ! wall 0.251679 comb 0.250000 user 0.250000 sys 0.000000 (median of 38) revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f before: ! wall 0.013414 comb 0.020000 user 0.020000 sys 0.000000 (median of 220) after: ! wall 0.013222 comb 0.020000 user 0.020000 sys 0.000000 (median of 223) revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63 before: ! wall 0.002711 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000) after: ! wall 0.001631 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000) revision: small amount; added files: small amount; rename small amount; 4bc173b045a6 964879152e2e before: ! wall 0.000077 comb 0.000000 user 0.000000 sys 0.000000 (median of 12208) after: ! wall 0.000078 comb 0.000000 user 0.000000 sys 0.000000 (median of 12012) revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe before: ! wall 0.410067 comb 0.410000 user 0.410000 sys 0.000000 (median of 23) after: ! wall 0.207786 comb 0.200000 user 0.200000 sys 0.000000 (median of 46) revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d before: ! wall 0.097004 comb 0.090000 user 0.090000 sys 0.000000 (median of 100) after: ! wall 0.038495 comb 0.030000 user 0.030000 sys 0.000000 (median of 100) Differential Revision: https://phab.mercurial-scm.org/D7074
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
20832
5d57b2101ab1 tests: don't hardcode path to bash interpreter
Olle Lundberg <geek@nerd.sh>
parents: 14119
diff changeset 
     1
 
#!/usr/bin/env bash
14118
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset 
     2
 
hg init rebase
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset 
     3
 
cd rebase
7fd8e597f99c tests: introduce a rebase bundle to use with rebase tests
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset 
     4
 







14119






624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




     5


#  @  7: 'H'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




     6


#  |













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




     7


#  | o  6: 'G'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




     8


#  |/|













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




     9


#  o |  5: 'F'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    10


#  | |













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    11


#  | o  4: 'E'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    12


#  |/













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    13


#  | o  3: 'D'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    14


#  | |













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    15


#  | o  2: 'C'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    16


#  | |













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    17


#  | o  1: 'B'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    18


#  |/













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    19


#  o  0: 'A'













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    20









14118






7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    21


echo A > A













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    22


hg ci -Am A













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    23


echo B > B













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    24


hg ci -Am B













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    25


echo C > C













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    26


hg ci -Am C













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    27


echo D > D













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    28


hg ci -Am D








14119






624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    29


hg up -q -C 0













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    30


echo E > E













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    31


hg ci -Am E













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    32


hg up -q -C 0








14118






7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    33


echo F > F













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    34


hg ci -Am F








14119






624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    35


hg merge -r 4













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    36


hg ci -m G













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    37


hg up -q -C 5













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    38


echo H > H













624e5ce615ec
tests: upgrade bundles/rebase.hg to support test-rebase-collapse



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 
14118

diff
changeset




    39


hg ci -Am H








14118






7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    40














7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    41


hg bundle -a ../rebase.hg













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    42














7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    43


cd ..













7fd8e597f99c
tests: introduce a rebase bundle to use with rebase tests



Nicolas Dumazet <nicdumz.commits@gmail.com>


parents: 

diff
changeset




    44


rm -Rf rebase















Mercurial