Mercurial > hg > mercurial-source
view tests/test-pull-branch.t @ 44087:ffd04bc9f57d
copies: move from a copy on branchpoint to a copy on write approach
Before this changes, any branch points results in a copy of the dictionary containing the
copy information. This can be very costly for branchy history with few rename
information. Instead, we take a "copy on write" approach. Copying the input data
only when we are about to update them.
In practice we where already doing the copying in half of these case (because
`_chain` makes a copy), so we don't add a significant cost here even in the
linear case. However the speed up in branchy case is very significant. Here are
some timing on the pypy repository.
revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29
before: ! wall 1.399863 comb 1.400000 user 1.370000 sys 0.030000 (median of 10)
after: ! wall 0.766453 comb 0.770000 user 0.750000 sys 0.020000 (median of 11)
revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2
before: ! wall 1.876748 comb 1.890000 user 1.870000 sys 0.020000 (median of 10)
after: ! wall 1.167223 comb 1.170000 user 1.150000 sys 0.020000 (median of 10)
revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0
before: ! wall 0.242457 comb 0.240000 user 0.240000 sys 0.000000 (median of 39)
after: ! wall 0.211476 comb 0.210000 user 0.210000 sys 0.000000 (median of 45)
revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f
before: ! wall 0.013193 comb 0.020000 user 0.020000 sys 0.000000 (median of 224)
after: ! wall 0.013290 comb 0.010000 user 0.010000 sys 0.000000 (median of 222)
revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63
before: ! wall 0.001673 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000)
after: ! wall 0.001677 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.000119 comb 0.000000 user 0.000000 sys 0.000000 (median of 8023)
after: ! wall 0.000119 comb 0.000000 user 0.000000 sys 0.000000 (median of 7997)
revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe
before: ! wall 0.201898 comb 0.210000 user 0.200000 sys 0.010000 (median of 48)
after: ! wall 0.167415 comb 0.170000 user 0.160000 sys 0.010000 (median of 58)
revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d
before: ! wall 0.036820 comb 0.040000 user 0.040000 sys 0.000000 (median of 100)
after: ! wall 0.035797 comb 0.040000 user 0.040000 sys 0.000000 (median of 100)
The extra cost in the linear case can be reclaimed later with some extra logic.
Differential Revision: https://phab.mercurial-scm.org/D7124
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 15 Oct 2019 18:23:34 +0200 |
| parents | d0abd7949ea3 |
| children |
line wrap: on
line source
$ hg init t $ cd t $ echo 1 > foo $ hg ci -Am1 # 0 adding foo $ hg branch branchA marked working directory as branch branchA (branches are permanent and global, did you want a bookmark?) $ echo a1 > foo $ hg ci -ma1 # 1 $ cd .. $ hg init tt $ cd tt $ hg pull ../t pulling from ../t requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets 495a0ec48aaf:50e089d141b7 (run 'hg update' to get a working copy) $ hg up branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../t $ echo a2 > foo $ hg ci -ma2 # 2 Create branch B: $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg branch branchB marked working directory as branch branchB $ echo b1 > foo $ hg ci -mb1 # 3 $ cd ../tt A new branch is there $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) new changesets 9f878dea0b96:5be59ce5067b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Develop both branches: $ cd ../t $ hg up branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a3 > foo $ hg ci -ma3 # 4 $ hg up branchB 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b2 > foo $ hg ci -mb2 # 5 $ cd ../tt Should succeed, no new heads: $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets 7c8fe7e20c32:453e93fa00a5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Add a head on other branch: $ cd ../t $ hg up branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a4 > foo $ hg ci -ma4 # 6 $ hg up branchB 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b3.1 > foo $ hg ci -m b3.1 # 7 $ hg up 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b3.2 > foo $ hg ci -m b3.2 # 8 created new head $ cd ../tt Should succeed because there is only one head on our branch: $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) new changesets da3a8a0161c6:b61cab8fe4e8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../t $ hg up -C branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a5.1 > foo $ hg ci -ma5.1 # 9 $ hg up 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a5.2 > foo $ hg ci -ma5.2 # 10 created new head $ hg up 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b4.1 > foo $ hg ci -m b4.1 # 11 $ hg up -C 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b4.2 > foo $ hg ci -m b4.2 # 12 $ cd ../tt $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files (+1 heads) new changesets 0c4d148ae29e:ecfc3f4a6fd9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "d740e1a584e7: a5.2" 1 other heads for branch "branchA" Make changes on new branch on tt $ hg up 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg branch branchC marked working directory as branch branchC $ echo b1 > bar $ hg ci -Am "commit on branchC on tt" adding bar Make changes on default branch on t $ cd ../t $ hg up -C default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > bar $ hg ci -Am "commit on default on t" adding bar Pull branchC from tt $ hg pull ../tt pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 7d8ffa4c0b22 13 local changesets published (run 'hg heads' to see heads) Make changes on default and branchC on tt $ cd ../tt $ hg pull ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 2b94b54b6b5f 1 local changesets published (run 'hg heads' to see heads) $ hg up -C default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > bar1 $ hg ci -Am "commit on default on tt" adding bar1 $ hg up branchC 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a1 > bar2 $ hg ci -Am "commit on branchC on tt" adding bar2 Make changes on default and branchC on t $ cd ../t $ hg up default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > bar3 $ hg ci -Am "commit on default on t" adding bar3 $ hg up branchC 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a1 > bar4 $ hg ci -Am "commit on branchC on tt" adding bar4 Pull from tt $ hg pull ../tt pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+2 heads) new changesets eed40c14b407:e634733b0309 1 local changesets published (run 'hg heads .' to see heads, 'hg merge' to merge) $ cd ..