2017-04-18 04:08:07 +03:00
|
|
|
#require p4
|
|
|
|
|
|
2017-05-12 03:13:31 +03:00
|
|
|
$ . $TESTDIR/p4setup.sh
|
p4fastimport : introducing fast Perforce to Mercurial convert extension
Summary:
`p4fastimport` is a fast convert extensions for Perforce to Mercurial. It
is designed to generate filelogs in parallel from Perforce. It tries to
minimize the use of Perforce commands and reads from the the Perforce
store on a Perforce server directly.
The core of p4fastimport is the idea to generate a Mercurial filelog
directly from the underlying Perforce data, as a Perforce file in most
cases matches a filelog directly (per-file branches is an exception). To
generate a filelog we are reading each file for an imported revision. A
file in Perforce is locally either stored in RCS, as a compressed GZIP
or as an flat file (binaries). If we do not find a version locally on
disk we fallback to downloading it from Perforce.
We are generating manifests after all filelogs are imported. A manifest
is constructed by adding and removing files from an initial state. We
are generating the correct offset from a manifest into the filelog by
keeping track of how often a file was touched.
We then generate the changelog.
Linkrev generation is a bit tricky. For every file in Perforce know
to which changelist it belongs, as it's stored revisions contains the
changelist. E.g. 1.1422 is the file changed in the changelist 1422 (this
refers to the "original" changelist, before a potential renumbering,
which is why we use the -O switch). We use the CL number obtained
from the revision to reverse lookup the offset in the sorted list of
changelists, which corresponds to it's place in the changelog later,
and therefore it's correct linkrev.
Parallel imports: In order to run parallel imports we MUST keep one lock
at a time, even if we import multiple file logs at the same time. However
filelogs use a singular `fncache`, which will be corrupted if we generate
filelogs in parallel. To avoid this, repositories must be generated with
*fncache* disabled! This restricts `p4fastimport` with workers to run
only on case sensitive file systems.
Test Plan:
The included tests as well as multiple imports from a small testing
Perforce client. Afterwards successfully run `hg verify`
make tests
Reviewers: #idi, quark, durham
Reviewed By: durham
Subscribers: mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D4776651
Signature: t1:4776651:1492015012:0161c4f45eab4d3b64597d012188c5f2007e8f7d
2017-04-13 21:11:09 +03:00
|
|
|
|
|
|
|
|
populate the depot
|
|
|
|
|
$ mkdir Main
|
|
|
|
|
$ mkdir Main/b
|
|
|
|
|
$ echo '1' > Main/a
|
|
|
|
|
$ p4 add Main/a
|
|
|
|
|
//depot/Main/a#1 - opened for add
|
|
|
|
|
$ p4 submit -d'CL1(1)'
|
|
|
|
|
Submitting change 1.
|
|
|
|
|
Locking 1 files ...
|
|
|
|
|
add //depot/Main/a#1
|
|
|
|
|
Change 1 submitted.
|
|
|
|
|
|
|
|
|
|
$ p4 edit Main/a
|
|
|
|
|
//depot/Main/a#1 - opened for edit
|
|
|
|
|
$ echo '4' > Main/a
|
|
|
|
|
$ cat >desc <<EOF
|
|
|
|
|
> Change: new
|
|
|
|
|
> Client: $P4CLIENT
|
|
|
|
|
> User: $USER
|
|
|
|
|
> Status: new
|
|
|
|
|
> Description: CL4(2)
|
|
|
|
|
> Files:
|
|
|
|
|
> //depot/Main/a # edit
|
|
|
|
|
> EOF
|
|
|
|
|
$ p4 shelve -i < desc
|
|
|
|
|
Change 2 created with 1 open file(s).
|
|
|
|
|
Shelving files for change 2.
|
|
|
|
|
edit //depot/Main/a#1
|
|
|
|
|
Change 2 files shelved.
|
|
|
|
|
$ p4 reopen -c default Main/a
|
|
|
|
|
//depot/Main/a#1 - reopened; default change
|
|
|
|
|
$ echo '3' > Main/a
|
|
|
|
|
$ p4 submit -d'CL3(3)'
|
|
|
|
|
Submitting change 3.
|
|
|
|
|
Locking 1 files ...
|
|
|
|
|
edit //depot/Main/a#2
|
|
|
|
|
Change 3 submitted.
|
|
|
|
|
$ cat Main/a
|
|
|
|
|
3
|
|
|
|
|
$ p4 unshelve -s 2 -c 2
|
|
|
|
|
//depot/Main/a#1 - unshelved, opened for edit
|
|
|
|
|
$ p4 shelve -c 2 -d
|
|
|
|
|
Shelved change 2 deleted.
|
|
|
|
|
$ p4 sync
|
|
|
|
|
//depot/Main/a#2 - is opened and not being changed
|
|
|
|
|
* //depot/Main/a - must resolve #2 before submitting (glob)
|
|
|
|
|
$ p4 resolve -ay
|
|
|
|
|
$TESTTMP/p4/Main/a - vs //depot/Main/a#2
|
|
|
|
|
//hg-p4-import/Main/a - ignored //depot/Main/a
|
|
|
|
|
$ p4 submit -c 2
|
|
|
|
|
Submitting change 2.
|
|
|
|
|
Locking 1 files ...
|
|
|
|
|
edit //depot/Main/a#3
|
|
|
|
|
Change 2 renamed change 4 and submitted.
|
|
|
|
|
$ cat Main/a
|
|
|
|
|
4
|
|
|
|
|
|
|
|
|
|
Import
|
|
|
|
|
|
|
|
|
|
$ cd $hgwd
|
|
|
|
|
$ hg init --config 'format.usefncache=False'
|
|
|
|
|
$ hg p4fastimport --debug -P $P4ROOT hg-p4-import
|
|
|
|
|
loading changelist numbers.
|
|
|
|
|
3 changelists to import.
|
|
|
|
|
loading list of files.
|
|
|
|
|
1 files to import.
|
2017-05-02 06:43:11 +03:00
|
|
|
reading filelog * (glob)
|
p4fastimport : introducing fast Perforce to Mercurial convert extension
Summary:
`p4fastimport` is a fast convert extensions for Perforce to Mercurial. It
is designed to generate filelogs in parallel from Perforce. It tries to
minimize the use of Perforce commands and reads from the the Perforce
store on a Perforce server directly.
The core of p4fastimport is the idea to generate a Mercurial filelog
directly from the underlying Perforce data, as a Perforce file in most
cases matches a filelog directly (per-file branches is an exception). To
generate a filelog we are reading each file for an imported revision. A
file in Perforce is locally either stored in RCS, as a compressed GZIP
or as an flat file (binaries). If we do not find a version locally on
disk we fallback to downloading it from Perforce.
We are generating manifests after all filelogs are imported. A manifest
is constructed by adding and removing files from an initial state. We
are generating the correct offset from a manifest into the filelog by
keeping track of how often a file was touched.
We then generate the changelog.
Linkrev generation is a bit tricky. For every file in Perforce know
to which changelist it belongs, as it's stored revisions contains the
changelist. E.g. 1.1422 is the file changed in the changelist 1422 (this
refers to the "original" changelist, before a potential renumbering,
which is why we use the -O switch). We use the CL number obtained
from the revision to reverse lookup the offset in the sorted list of
changelists, which corresponds to it's place in the changelog later,
and therefore it's correct linkrev.
Parallel imports: In order to run parallel imports we MUST keep one lock
at a time, even if we import multiple file logs at the same time. However
filelogs use a singular `fncache`, which will be corrupted if we generate
filelogs in parallel. To avoid this, repositories must be generated with
*fncache* disabled! This restricts `p4fastimport` with workers to run
only on case sensitive file systems.
Test Plan:
The included tests as well as multiple imports from a small testing
Perforce client. Afterwards successfully run `hg verify`
make tests
Reviewers: #idi, quark, durham
Reviewed By: durham
Subscribers: mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D4776651
Signature: t1:4776651:1492015012:0161c4f45eab4d3b64597d012188c5f2007e8f7d
2017-04-13 21:11:09 +03:00
|
|
|
importing repository.
|
2017-04-25 17:29:39 +03:00
|
|
|
writing filelog: b8e02f643373, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob)
|
|
|
|
|
writing filelog: 059c099e8c05, p1 b8e02f643373, linkrev 1, 2 bytes, src: *, path: Main/a (glob)
|
|
|
|
|
writing filelog: de9e19b2b7a1, p1 059c099e8c05, linkrev 2, 2 bytes, src: *, path: Main/a (glob)
|
|
|
|
|
changelist 1: writing manifest. node: ce8f3d0156f3 p1: 000000000000 p2: 000000000000 linkrev: 0
|
2017-04-20 09:33:06 +03:00
|
|
|
changelist 1: writing changelog: CL1(1)
|
2017-04-25 17:29:39 +03:00
|
|
|
changelist 3: writing manifest. node: 63f2b10f26c4 p1: ce8f3d0156f3 p2: 000000000000 linkrev: 1
|
2017-04-20 09:33:06 +03:00
|
|
|
changelist 3: writing changelog: CL3(3)
|
2017-04-25 17:29:39 +03:00
|
|
|
changelist 4: writing manifest. node: c654b16ed766 p1: 63f2b10f26c4 p2: 000000000000 linkrev: 2
|
2017-04-20 09:33:06 +03:00
|
|
|
changelist 4: writing changelog: CL4(2)
|
2017-05-19 01:19:14 +03:00
|
|
|
updating the branch cache (?)
|
p4fastimport : introducing fast Perforce to Mercurial convert extension
Summary:
`p4fastimport` is a fast convert extensions for Perforce to Mercurial. It
is designed to generate filelogs in parallel from Perforce. It tries to
minimize the use of Perforce commands and reads from the the Perforce
store on a Perforce server directly.
The core of p4fastimport is the idea to generate a Mercurial filelog
directly from the underlying Perforce data, as a Perforce file in most
cases matches a filelog directly (per-file branches is an exception). To
generate a filelog we are reading each file for an imported revision. A
file in Perforce is locally either stored in RCS, as a compressed GZIP
or as an flat file (binaries). If we do not find a version locally on
disk we fallback to downloading it from Perforce.
We are generating manifests after all filelogs are imported. A manifest
is constructed by adding and removing files from an initial state. We
are generating the correct offset from a manifest into the filelog by
keeping track of how often a file was touched.
We then generate the changelog.
Linkrev generation is a bit tricky. For every file in Perforce know
to which changelist it belongs, as it's stored revisions contains the
changelist. E.g. 1.1422 is the file changed in the changelist 1422 (this
refers to the "original" changelist, before a potential renumbering,
which is why we use the -O switch). We use the CL number obtained
from the revision to reverse lookup the offset in the sorted list of
changelists, which corresponds to it's place in the changelog later,
and therefore it's correct linkrev.
Parallel imports: In order to run parallel imports we MUST keep one lock
at a time, even if we import multiple file logs at the same time. However
filelogs use a singular `fncache`, which will be corrupted if we generate
filelogs in parallel. To avoid this, repositories must be generated with
*fncache* disabled! This restricts `p4fastimport` with workers to run
only on case sensitive file systems.
Test Plan:
The included tests as well as multiple imports from a small testing
Perforce client. Afterwards successfully run `hg verify`
make tests
Reviewers: #idi, quark, durham
Reviewed By: durham
Subscribers: mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D4776651
Signature: t1:4776651:1492015012:0161c4f45eab4d3b64597d012188c5f2007e8f7d
2017-04-13 21:11:09 +03:00
|
|
|
3 revision(s), 1 file(s) imported.
|
|
|
|
|
$ hg verify
|
|
|
|
|
checking changesets
|
|
|
|
|
checking manifests
|
|
|
|
|
crosschecking files in changesets and manifests
|
|
|
|
|
checking files
|
|
|
|
|
1 files, 3 changesets, 3 total revisions
|
2017-04-25 17:29:39 +03:00
|
|
|
$ hg cat -r tip Main/a
|
p4fastimport : introducing fast Perforce to Mercurial convert extension
Summary:
`p4fastimport` is a fast convert extensions for Perforce to Mercurial. It
is designed to generate filelogs in parallel from Perforce. It tries to
minimize the use of Perforce commands and reads from the the Perforce
store on a Perforce server directly.
The core of p4fastimport is the idea to generate a Mercurial filelog
directly from the underlying Perforce data, as a Perforce file in most
cases matches a filelog directly (per-file branches is an exception). To
generate a filelog we are reading each file for an imported revision. A
file in Perforce is locally either stored in RCS, as a compressed GZIP
or as an flat file (binaries). If we do not find a version locally on
disk we fallback to downloading it from Perforce.
We are generating manifests after all filelogs are imported. A manifest
is constructed by adding and removing files from an initial state. We
are generating the correct offset from a manifest into the filelog by
keeping track of how often a file was touched.
We then generate the changelog.
Linkrev generation is a bit tricky. For every file in Perforce know
to which changelist it belongs, as it's stored revisions contains the
changelist. E.g. 1.1422 is the file changed in the changelist 1422 (this
refers to the "original" changelist, before a potential renumbering,
which is why we use the -O switch). We use the CL number obtained
from the revision to reverse lookup the offset in the sorted list of
changelists, which corresponds to it's place in the changelog later,
and therefore it's correct linkrev.
Parallel imports: In order to run parallel imports we MUST keep one lock
at a time, even if we import multiple file logs at the same time. However
filelogs use a singular `fncache`, which will be corrupted if we generate
filelogs in parallel. To avoid this, repositories must be generated with
*fncache* disabled! This restricts `p4fastimport` with workers to run
only on case sensitive file systems.
Test Plan:
The included tests as well as multiple imports from a small testing
Perforce client. Afterwards successfully run `hg verify`
make tests
Reviewers: #idi, quark, durham
Reviewed By: durham
Subscribers: mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D4776651
Signature: t1:4776651:1492015012:0161c4f45eab4d3b64597d012188c5f2007e8f7d
2017-04-13 21:11:09 +03:00
|
|
|
4
|
|
|
|
|
stopping the p4 server
|
