mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
c32047e854
Summary: We currently call "p4 where" on all files in the new client spec, which is roughly O(all files in ovrsource), and it's only going to get worse as ovrsource grows :( This diff makes the number of calls O(files added & removed between two client specs) by filtering them in the following way: - get a full list of files from old client (L1) - get a full list of files from new client (L2) - files_added = L2 - L1 - files_removed = L1 - L2 - `p4 where` on (files_added + files_removed) How much speedup do we get? from [2018-04-25 16:07:27,725]INFO:root: Start sync import in ovrsource-master [2018-04-25 17:35:35,873]INFO:root: Finish sync import in ovrsource-master after 5288.147963762283 seconds to [2018-04-26 13:43:28,819]INFO:root: Start sync import in ovrsource-master [2018-04-26 13:51:35,575]INFO:root: Finish sync import in ovrsource-master after 486.7560772895813 seconds on this change D7722798 Differential Revision: D7772403 fbshipit-source-id: 05a16343264007ee3ee466621da9da888c2368d7
183 lines
4.8 KiB
Perl
183 lines
4.8 KiB
Perl
#require p4
|
|
|
|
$ . $TESTDIR/p4setup.sh
|
|
|
|
$ p4 client -o hg-p4-import-narrow | sed '/^View:/,$ d' >p4client
|
|
$ echo "View:" >>p4client
|
|
$ echo " //depot/Main/Narrow/... //hg-p4-import-narrow/Main/Narrow/..." >>p4client
|
|
$ p4 client -i <p4client
|
|
Client hg-p4-import-narrow saved.
|
|
|
|
Populate the Depot
|
|
$ mkdir Main
|
|
$ mkdir Main/Narrow
|
|
$ echo a > Main/Narrow/a
|
|
$ echo b > Main/Narrow/b
|
|
$ ln -s a Main/Narrow/symlink
|
|
$ p4 add Main/Narrow/a Main/Narrow/b Main/Narrow/symlink
|
|
//depot/Main/Narrow/a#1 - opened for add
|
|
//depot/Main/Narrow/b#1 - opened for add
|
|
//depot/Main/Narrow/symlink#1 - opened for add
|
|
$ p4 submit -d initial
|
|
Submitting change 1.
|
|
Locking 3 files ...
|
|
add //depot/Main/Narrow/a#1
|
|
add //depot/Main/Narrow/b#1
|
|
add //depot/Main/Narrow/symlink#1
|
|
Change 1 submitted.
|
|
|
|
$ p4 edit Main/Narrow/a
|
|
//depot/Main/Narrow/a#1 - opened for edit
|
|
$ echo a >> Main/Narrow/a
|
|
$ p4 edit -t text+x Main/Narrow/b
|
|
//depot/Main/Narrow/b#1 - opened for edit
|
|
$ p4 submit -d second
|
|
Submitting change 2.
|
|
Locking 2 files ...
|
|
edit //depot/Main/Narrow/a#2
|
|
edit //depot/Main/Narrow/b#2
|
|
Change 2 submitted.
|
|
|
|
$ mkdir Main/Outside
|
|
$ echo a >> Main/Outside/a
|
|
$ p4 add Main/Outside/a
|
|
//depot/Main/Outside/a#1 - opened for add
|
|
$ p4 submit -d third
|
|
Submitting change 3.
|
|
Locking 1 files ...
|
|
add //depot/Main/Outside/a#1
|
|
Change 3 submitted.
|
|
|
|
$ p4 edit Main/Outside/a
|
|
//depot/Main/Outside/a#1 - opened for edit
|
|
$ echo a >> Main/Outside/a
|
|
$ p4 submit -d fourth
|
|
Submitting change 4.
|
|
Locking 1 files ...
|
|
edit //depot/Main/Outside/a#2
|
|
Change 4 submitted.
|
|
|
|
Seq Import
|
|
|
|
$ cd $hgwd
|
|
$ hg init --config 'format.usefncache=False'
|
|
$ hg p4seqimport --bookmark master -P $P4ROOT hg-p4-import-narrow
|
|
|
|
Verify
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
3 files, 2 changesets, 4 total revisions
|
|
|
|
Sync Import
|
|
|
|
$ hg p4syncimport --bookmark master --debug -P $P4ROOT hg-p4-import-narrow hg-p4-import
|
|
incremental import from changelist: 3, node: * (glob)
|
|
2 (current client) 4 (requested client) 2 (latest imported)
|
|
latest change list number 4
|
|
1 added files
|
|
0 removed files
|
|
committing files:
|
|
Main/Outside/a
|
|
file: //depot/Main/Outside/a, src: * (glob)
|
|
committing manifest
|
|
committing changelog
|
|
updating the branch cache
|
|
|
|
$ hg manifest -vr tip
|
|
644 Main/Narrow/a
|
|
755 * Main/Narrow/b
|
|
644 @ Main/Narrow/symlink
|
|
644 Main/Outside/a
|
|
|
|
$ hg log -r tip -T '{files}'
|
|
Main/Outside/a (no-eol)
|
|
$ hg log -r tip -T '{file_adds}'
|
|
Main/Outside/a (no-eol)
|
|
$ hg log -r tip -T '{file_dels}'
|
|
$ hg log -r tip -T '{file_mods}'
|
|
$ hg log -r tip -T '{file_copies}'
|
|
|
|
Verify
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
4 files, 3 changesets, 5 total revisions
|
|
|
|
$ hg update master
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark master)
|
|
|
|
Seq Import after Sync Import
|
|
|
|
$ hg p4seqimport --bookmark master -P $P4ROOT hg-p4-import
|
|
|
|
Syncimport must abort if there are newer commits
|
|
|
|
$ cd $p4wd
|
|
$ p4 edit Main/Outside/a
|
|
//depot/Main/Outside/a#2 - opened for edit
|
|
$ echo a >> Main/Outside/a
|
|
$ p4 submit -d fifth
|
|
Submitting change 5.
|
|
Locking 1 files ...
|
|
edit //depot/Main/Outside/a#3
|
|
Change 5 submitted.
|
|
|
|
$ cd $hgwd
|
|
$ hg p4syncimport --bookmark master --debug -P $P4ROOT hg-p4-import-narrow hg-p4-import
|
|
incremental import from changelist: 5, node: * (glob)
|
|
2 (current client) 5 (requested client) 4 (latest imported)
|
|
abort: repository must contain most recent changes
|
|
[255]
|
|
|
|
Remove stuff
|
|
|
|
$ hg p4seqimport --bookmark master -P $P4ROOT hg-p4-import
|
|
$ hg p4syncimport --bookmark master --debug -P $P4ROOT hg-p4-import hg-p4-import-narrow
|
|
incremental import from changelist: 6, node: * (glob)
|
|
5 (current client) 2 (requested client) 5 (latest imported)
|
|
latest change list number 2
|
|
0 added files
|
|
1 removed files
|
|
committing files:
|
|
committing manifest
|
|
committing changelog
|
|
updating the branch cache
|
|
|
|
$ hg manifest -vr tip
|
|
644 Main/Narrow/a
|
|
755 * Main/Narrow/b
|
|
644 @ Main/Narrow/symlink
|
|
|
|
$ hg log -r tip -T '{files}'
|
|
Main/Outside/a (no-eol)
|
|
$ hg log -r tip -T '{file_adds}'
|
|
$ hg log -r tip -T '{file_dels}'
|
|
Main/Outside/a (no-eol)
|
|
$ hg log -r tip -T '{file_mods}'
|
|
$ hg log -r tip -T '{file_copies}'
|
|
|
|
Sync Import empty changes
|
|
$ cd $p4wd
|
|
$ p4 delete Main/Outside/a
|
|
//depot/Main/Outside/a#3 - opened for delete
|
|
$ p4 submit -d sixth
|
|
Submitting change 6.
|
|
Locking 1 files ...
|
|
delete //depot/Main/Outside/a#4
|
|
Change 6 submitted.
|
|
$ cd $hgwd
|
|
$ hg p4seqimport --bookmark master -P $P4ROOT hg-p4-import-narrow
|
|
$ hg p4syncimport --bookmark master -P $P4ROOT hg-p4-import-narrow hg-p4-import
|
|
nothing to import.
|
|
|
|
End Test
|
|
stopping the p4 server
|