mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
835157e77d
The revbranchcache is read on demand before it will be used for updating the branch map. It is written back when the branchmap is written and it will thus use the same locking as branchmap. The revbranchcache instance is short-lived; it is only stored in the branchmap from .update() is invoked and until .write() is invoked. Branchmap already assume that the repo is locked in that case. The use of revbranchcache for branch map updates will make sure that the revbranchcache "always" is kept up-to-date. The perfbranchmap benchmark is somewhat bogus, especially when we can see that the caching makes a significant difference between the realistic case of a first run and the rare case of rerunning it with a full cache. Here are some 'base' numbers on mozilla-central: Before: ! wall 6.912745 comb 6.910000 user 6.840000 sys 0.070000 (best of 3) After - initial, cache is empty: ! wall 7.792569 comb 7.790000 user 7.720000 sys 0.070000 (best of 3) After - cache is full: ! wall 0.879688 comb 0.880000 user 0.870000 sys 0.010000 (best of 4) The overhead when running with empty cache comes from checking, missing and updating it every time. Most of the performance improvement comes from not having to extract the branch info from the changelog. The last doubling of performance comes from no longer having to convert all branch names to local encoding but reuse the few already converted branch names. On the hg repo: Before: ! wall 0.715703 comb 0.710000 user 0.710000 sys 0.000000 (best of 14) After: ! wall 0.105489 comb 0.110000 user 0.110000 sys 0.000000 (best of 87)
146 lines
5.3 KiB
Perl
146 lines
5.3 KiB
Perl
#require svn svn-bindings
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> convert =
|
|
> EOF
|
|
|
|
$ svnadmin create svn-repo
|
|
$ svnadmin load -q svn-repo < "$TESTDIR/svn/encoding.svndump"
|
|
|
|
Convert while testing all possible outputs
|
|
|
|
$ hg --debug convert svn-repo A-hg
|
|
initializing destination A-hg repository
|
|
reparent to file://*/svn-repo (glob)
|
|
run hg sink pre-conversion action
|
|
scanning source...
|
|
found trunk at 'trunk'
|
|
found tags at 'tags'
|
|
found branches at 'branches'
|
|
found branch branch\xc3\xa9 at 5 (esc)
|
|
found branch branch\xc3\xa9e at 6 (esc)
|
|
scanning: 1/4 revisions (25.00%)
|
|
reparent to file://*/svn-repo/trunk (glob)
|
|
fetching revision log for "/trunk" from 4 to 0
|
|
parsing revision 4 (2 changes)
|
|
parsing revision 3 (4 changes)
|
|
parsing revision 2 (3 changes)
|
|
parsing revision 1 (3 changes)
|
|
no copyfrom path, don't know what to do.
|
|
'/branches' is not under '/trunk', ignoring
|
|
'/tags' is not under '/trunk', ignoring
|
|
scanning: 2/4 revisions (50.00%)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
|
|
fetching revision log for "/branches/branch\xc3\xa9" from 5 to 0 (esc)
|
|
parsing revision 5 (1 changes)
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
|
|
found parent of branch /branches/branch\xc3\xa9 at 4: /trunk (esc)
|
|
scanning: 3/4 revisions (75.00%)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
|
|
fetching revision log for "/branches/branch\xc3\xa9e" from 6 to 0 (esc)
|
|
parsing revision 6 (1 changes)
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
|
|
found parent of branch /branches/branch\xc3\xa9e at 5: /branches/branch\xc3\xa9 (esc)
|
|
scanning: 4/4 revisions (100.00%)
|
|
scanning: 5/4 revisions (125.00%)
|
|
scanning: 6/4 revisions (150.00%)
|
|
sorting...
|
|
converting...
|
|
5 init projA
|
|
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1
|
|
converting: 0/6 revisions (0.00%)
|
|
committing changelog
|
|
couldn't read revision branch cache names: * (glob)
|
|
4 hello
|
|
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2
|
|
converting: 1/6 revisions (16.67%)
|
|
reparent to file://*/svn-repo/trunk (glob)
|
|
scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc)
|
|
scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc)
|
|
scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc)
|
|
committing files:
|
|
\xc3\xa0/e\xcc\x81 (esc)
|
|
getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc)
|
|
\xc3\xa9 (esc)
|
|
getting files: \xc3\xa9 2/2 (100.00%) (esc)
|
|
committing manifest
|
|
committing changelog
|
|
3 copy files
|
|
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3
|
|
converting: 2/6 revisions (33.33%)
|
|
scanning paths: /trunk/\xc3\xa0 0/4 (0.00%) (esc)
|
|
gone from -1
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/trunk (glob)
|
|
scanning paths: /trunk/\xc3\xa8 1/4 (25.00%) (esc)
|
|
copied to \xc3\xa8 from \xc3\xa9@2 (esc)
|
|
scanning paths: /trunk/\xc3\xa9 2/4 (50.00%) (esc)
|
|
gone from -1
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/trunk (glob)
|
|
scanning paths: /trunk/\xc3\xb9 3/4 (75.00%) (esc)
|
|
mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc)
|
|
getting files: \xc3\xa0/e\xcc\x81 1/4 (25.00%) (esc)
|
|
getting files: \xc3\xa9 2/4 (50.00%) (esc)
|
|
committing files:
|
|
\xc3\xa8 (esc)
|
|
getting files: \xc3\xa8 3/4 (75.00%) (esc)
|
|
\xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc)
|
|
\xc3\xb9/e\xcc\x81 (esc)
|
|
getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc)
|
|
\xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc)
|
|
committing manifest
|
|
committing changelog
|
|
2 remove files
|
|
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4
|
|
converting: 3/6 revisions (50.00%)
|
|
scanning paths: /trunk/\xc3\xa8 0/2 (0.00%) (esc)
|
|
gone from -1
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/trunk (glob)
|
|
scanning paths: /trunk/\xc3\xb9 1/2 (50.00%) (esc)
|
|
gone from -1
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/trunk (glob)
|
|
getting files: \xc3\xa8 1/2 (50.00%) (esc)
|
|
getting files: \xc3\xb9/e\xcc\x81 2/2 (100.00%) (esc)
|
|
committing files:
|
|
committing manifest
|
|
committing changelog
|
|
1 branch to branch?
|
|
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
|
|
converting: 4/6 revisions (66.67%)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
|
|
scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc)
|
|
committing changelog
|
|
0 branch to branch?e
|
|
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6
|
|
converting: 5/6 revisions (83.33%)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
|
|
scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc)
|
|
committing changelog
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
|
|
reparent to file://*/svn-repo (glob)
|
|
reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
|
|
updating tags
|
|
committing files:
|
|
.hgtags
|
|
committing manifest
|
|
committing changelog
|
|
run hg sink post-conversion action
|
|
$ cd A-hg
|
|
$ hg up
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Check tags are in UTF-8
|
|
|
|
$ cat .hgtags
|
|
e94e4422020e715add80525e8f0f46c9968689f1 branch\xc3\xa9e (esc)
|
|
f7e66f98380ed1e53a797c5c7a7a2616a7ab377d branch\xc3\xa9 (esc)
|
|
|
|
$ cd ..
|