mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
7361dd4561
Summary: Symlinks must not have newlines at their end. However reading the content from Perforce, it might contain a newline, so we now strip it. Test Plan: python ../../hg-crew/tests/run-tests.py --keep-tmpdir test-p4fastimport-import-modes.t Reviewers: #idi, #mercurial, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5535514 Signature: t1:5535514:1501601075:20ce811a92d1d5b5a973e05db1d2110599c5ef52
90 lines
2.7 KiB
Raku
90 lines
2.7 KiB
Raku
#require p4
|
|
|
|
$ . $TESTDIR/p4setup.sh
|
|
|
|
populate the depot
|
|
$ mkdir Main
|
|
$ mkdir Main/b
|
|
$ echo a > Main/a
|
|
$ ln -s ../a Main/b/c
|
|
$ echo d > Main/d
|
|
$ chmod +x 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 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.
|
|
|
|
Simple import
|
|
|
|
$ cd $hgwd
|
|
$ hg init --config 'format.usefncache=False'
|
|
$ hg p4fastimport --debug -P $P4ROOT hg-p4-import
|
|
loading changelist numbers.
|
|
2 changelists to import.
|
|
loading list of files.
|
|
3 files to import.
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
reading filelog * (glob)
|
|
importing repository.
|
|
writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob)
|
|
writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob)
|
|
updating the branch cache (?)
|
|
writing filelog: 1f6b5bb93f1d, p1 000000000000, linkrev 0, 4 bytes, src: *, path: Main/b/c (glob)
|
|
writing filelog: 3b479db02621, p1 1f6b5bb93f1d, linkrev 1, 4 bytes, src: *, path: Main/b/c (glob)
|
|
writing filelog: a9092a3d84a3, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/d (glob)
|
|
writing filelog: f83f0637e55e, p1 a9092a3d84a3, linkrev 1, 4 bytes, src: *, path: Main/d (glob)
|
|
changelist 1: writing manifest. node: 05414d16d473 p1: 000000000000 p2: 000000000000 linkrev: 0
|
|
changelist 1: writing changelog: initial
|
|
changelist 2: writing manifest. node: fb65d73ad7d5 p1: 05414d16d473 p2: 000000000000 linkrev: 1
|
|
changelist 2: writing changelog: second
|
|
updating the branch cache (?)
|
|
2 revision(s), 3 file(s) imported.
|
|
|
|
Verify
|
|
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
3 files, 2 changesets, 6 total revisions
|
|
|
|
$ hg update tip
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
# Ensure that the file is a symlink (-L) and is valid (-f) this ensures
|
|
# we correctly handle symlinks.
|
|
|
|
$ test -L Main/b/c
|
|
$ test -f Main/b/c
|
|
$ hg --debug manifest
|
|
a80d06849b333b8a3d5c445f8ba3142010dcdc9e 644 Main/a
|
|
3b479db02621d5ff591921d4946681bebd4b2e2e 644 @ Main/b/c
|
|
f83f0637e55e3c48e9922f14a016761626d79d3d 755 * Main/d
|
|
|
|
End Test
|
|
|
|
stopping the p4 server
|