mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
b646c66e31
Summary: Adds p4changelist to commit extra info With p4changelist info, make p4seqimport incremental Add debug message to have more accurate info on what is actually being imported For a high-level overview of p4seqimport, please check https://our.intern.facebook.com/intern/wiki/IDI/p4seqimport/ Differential Revision: D7090090 fbshipit-source-id: 17529aa57452453cfe29c3c3dc9d9e7daa8cffb2
129 lines
3.3 KiB
Perl
129 lines
3.3 KiB
Perl
#require p4
|
|
|
|
$ . $TESTDIR/p4setup.sh
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [p4fastimport]
|
|
> useworker=force
|
|
> EOF
|
|
|
|
populate the depot
|
|
$ mkdir Main
|
|
$ mkdir Main/b
|
|
$ echo a > Main/a
|
|
$ echo c > Main/b/c
|
|
$ echo d > Main/d
|
|
$ p4 add Main/a Main/b/c Main/d
|
|
//depot/Main/a#1 - opened for add
|
|
//depot/Main/b/c#1 - opened for add
|
|
//depot/Main/d#1 - opened for add
|
|
$ p4 submit -d initial
|
|
Submitting change 1.
|
|
Locking 3 files ...
|
|
add //depot/Main/a#1
|
|
add //depot/Main/b/c#1
|
|
add //depot/Main/d#1
|
|
Change 1 submitted.
|
|
|
|
$ p4 edit Main/a Main/b/c Main/d
|
|
//depot/Main/a#1 - opened for edit
|
|
//depot/Main/b/c#1 - opened for edit
|
|
//depot/Main/d#1 - opened for edit
|
|
$ echo a >> Main/a
|
|
$ echo c >> Main/b/c
|
|
$ echo d >> Main/d
|
|
$ p4 submit -d second
|
|
Submitting change 2.
|
|
Locking 3 files ...
|
|
edit //depot/Main/a#2
|
|
edit //depot/Main/b/c#2
|
|
edit //depot/Main/d#2
|
|
Change 2 submitted.
|
|
$ p4 edit Main/a Main/b/c
|
|
//depot/Main/a#2 - opened for edit
|
|
//depot/Main/b/c#2 - opened for edit
|
|
$ echo a >> Main/a
|
|
$ echo c >> Main/b/c
|
|
$ echo e >> Main/e
|
|
$ p4 add Main/e
|
|
//depot/Main/e#1 - opened for add
|
|
$ p4 delete Main/d
|
|
//depot/Main/d#2 - opened for delete
|
|
$ p4 submit -d third
|
|
Submitting change 3.
|
|
Locking 4 files ...
|
|
edit //depot/Main/a#3
|
|
edit //depot/Main/b/c#3
|
|
delete //depot/Main/d#3
|
|
add //depot/Main/e#1
|
|
Change 3 submitted.
|
|
|
|
Simple import
|
|
|
|
$ cd $hgwd
|
|
$ hg init --config 'format.usefncache=False'
|
|
$ hg p4fastimport --bookmark master --limit 2 --debug -P $P4ROOT hg-p4-import
|
|
loading changelist numbers.
|
|
3 changelists to import.
|
|
updating the branch cache (?)
|
|
importing 2 only because of --limit.
|
|
loading list of files.
|
|
3 files to import.
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
importing repository.
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
changelist 1: writing manifest. node: a9f7e8df2a65 p1: 000000000000 p2: 000000000000 linkrev: 0
|
|
changelist 1: writing changelog: initial
|
|
changelist 2: writing manifest. node: e2b9d9177f8d p1: a9f7e8df2a65 p2: 000000000000 linkrev: 1
|
|
changelist 2: writing changelog: second
|
|
writing bookmark
|
|
updating the branch cache
|
|
2 revision(s), 3 file(s) imported.
|
|
$ hg p4fastimport --bookmark master --limit 2 --debug -P $P4ROOT hg-p4-import
|
|
incremental import from changelist: 3, node: * (glob)
|
|
loading changelist numbers.
|
|
1 changelists to import.
|
|
loading list of files.
|
|
4 files to import.
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
importing repository.
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
writing filelog: * (glob)
|
|
changelist 3: writing manifest. node: 2949480247c0 p1: e2b9d9177f8d p2: 000000000000 linkrev: 2
|
|
changelist 3: writing changelog: third
|
|
writing bookmark
|
|
updating the branch cache (?)
|
|
1 revision(s), 4 file(s) imported.
|
|
|
|
Verify
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
4 files, 3 changesets, 9 total revisions
|
|
|
|
$ hg update master
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark master)
|
|
|
|
$ hg manifest -r master
|
|
Main/a
|
|
Main/b/c
|
|
Main/e
|
|
|
|
End Test
|
|
|
|
stopping the p4 server
|