1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134
|
#!/bin/sh
test_description='Clone repositories and keep empty commits'
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
start_p4d
'
test_expect_success 'Create a repo' '
client_view "//depot/... //client/..." &&
(
cd "$cli" &&
mkdir -p subdir &&
>subdir/file1.txt &&
p4 add subdir/file1.txt &&
p4 submit -d "Add file 1" &&
>file2.txt &&
p4 add file2.txt &&
p4 submit -d "Add file 2" &&
>subdir/file3.txt &&
p4 add subdir/file3.txt &&
p4 submit -d "Add file 3" &&
>file4.txt &&
p4 add file4.txt &&
p4 submit -d "Add file 4" &&
p4 delete subdir/file3.txt &&
p4 submit -d "Remove file 3" &&
p4 delete file4.txt &&
p4 submit -d "Remove file 4"
)
'
test_expect_success 'Clone repo root path with all history' '
client_view "//depot/... //client/..." &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git p4 clone --use-client-spec --destination="$git" //depot@all &&
cat >expect <<-\EOF &&
Remove file 4
[git-p4: depot-paths = "//depot/": change = 6]
Remove file 3
[git-p4: depot-paths = "//depot/": change = 5]
Add file 4
[git-p4: depot-paths = "//depot/": change = 4]
Add file 3
[git-p4: depot-paths = "//depot/": change = 3]
Add file 2
[git-p4: depot-paths = "//depot/": change = 2]
Add file 1
[git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
test_cmp expect actual
)
'
test_expect_success 'Clone repo subdir with all history but keep empty commits' '
client_view "//depot/subdir/... //client/subdir/..." &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git config git-p4.keepEmptyCommits true &&
git p4 clone --use-client-spec --destination="$git" //depot@all &&
cat >expect <<-\EOF &&
Remove file 4
[git-p4: depot-paths = "//depot/": change = 6]
Remove file 3
[git-p4: depot-paths = "//depot/": change = 5]
Add file 4
[git-p4: depot-paths = "//depot/": change = 4]
Add file 3
[git-p4: depot-paths = "//depot/": change = 3]
Add file 2
[git-p4: depot-paths = "//depot/": change = 2]
Add file 1
[git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
test_cmp expect actual
)
'
test_expect_success 'Clone repo subdir with all history' '
client_view "//depot/subdir/... //client/subdir/..." &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git p4 clone --use-client-spec --destination="$git" --verbose //depot@all &&
cat >expect <<-\EOF &&
Remove file 3
[git-p4: depot-paths = "//depot/": change = 5]
Add file 3
[git-p4: depot-paths = "//depot/": change = 3]
Add file 1
[git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
test_cmp expect actual
)
'
test_expect_success 'kill p4d' '
kill_p4d
'
test_done
|