You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
233 lines
5.4 KiB
233 lines
5.4 KiB
#!/bin/sh |
|
|
|
test_description='git-p4 p4 branching tests' |
|
|
|
. ./lib-git-p4.sh |
|
|
|
test_expect_success 'start p4d' ' |
|
start_p4d |
|
' |
|
|
|
# |
|
# 1: //depot/main/f1 |
|
# 2: //depot/main/f2 |
|
# 3: integrate //depot/main/... -> //depot/branch1/... |
|
# 4: //depot/main/f4 |
|
# 5: //depot/branch1/f5 |
|
# .: named branch branch2 |
|
# 6: integrate -b branch2 |
|
# 7: //depot/branch2/f7 |
|
# 8: //depot/main/f8 |
|
# |
|
test_expect_success 'basic p4 branches' ' |
|
( |
|
cd "$cli" && |
|
mkdir -p main && |
|
|
|
echo f1 >main/f1 && |
|
p4 add main/f1 && |
|
p4 submit -d "main/f1" && |
|
|
|
echo f2 >main/f2 && |
|
p4 add main/f2 && |
|
p4 submit -d "main/f2" && |
|
|
|
p4 integrate //depot/main/... //depot/branch1/... && |
|
p4 submit -d "integrate main to branch1" && |
|
|
|
echo f4 >main/f4 && |
|
p4 add main/f4 && |
|
p4 submit -d "main/f4" && |
|
|
|
echo f5 >branch1/f5 && |
|
p4 add branch1/f5 && |
|
p4 submit -d "branch1/f5" && |
|
|
|
p4 branch -i <<-EOF && |
|
Branch: branch2 |
|
View: //depot/main/... //depot/branch2/... |
|
EOF |
|
|
|
p4 integrate -b branch2 && |
|
p4 submit -d "integrate main to branch2" && |
|
|
|
echo f7 >branch2/f7 && |
|
p4 add branch2/f7 && |
|
p4 submit -d "branch2/f7" && |
|
|
|
echo f8 >main/f8 && |
|
p4 add main/f8 && |
|
p4 submit -d "main/f8" |
|
) |
|
' |
|
|
|
test_expect_success 'import main, no branch detection' ' |
|
test_when_finished cleanup_git && |
|
"$GITP4" clone --dest="$git" //depot/main@all && |
|
( |
|
cd "$git" && |
|
git log --oneline --graph --decorate --all && |
|
git rev-list master >wc && |
|
test_line_count = 4 wc |
|
) |
|
' |
|
|
|
test_expect_success 'import branch1, no branch detection' ' |
|
test_when_finished cleanup_git && |
|
"$GITP4" clone --dest="$git" //depot/branch1@all && |
|
( |
|
cd "$git" && |
|
git log --oneline --graph --decorate --all && |
|
git rev-list master >wc && |
|
test_line_count = 2 wc |
|
) |
|
' |
|
|
|
test_expect_success 'import branch2, no branch detection' ' |
|
test_when_finished cleanup_git && |
|
"$GITP4" clone --dest="$git" //depot/branch2@all && |
|
( |
|
cd "$git" && |
|
git log --oneline --graph --decorate --all && |
|
git rev-list master >wc && |
|
test_line_count = 2 wc |
|
) |
|
' |
|
|
|
test_expect_success 'import depot, no branch detection' ' |
|
test_when_finished cleanup_git && |
|
"$GITP4" clone --dest="$git" //depot@all && |
|
( |
|
cd "$git" && |
|
git log --oneline --graph --decorate --all && |
|
git rev-list master >wc && |
|
test_line_count = 8 wc |
|
) |
|
' |
|
|
|
test_expect_success 'import depot, branch detection' ' |
|
test_when_finished cleanup_git && |
|
"$GITP4" clone --dest="$git" --detect-branches //depot@all && |
|
( |
|
cd "$git" && |
|
|
|
git log --oneline --graph --decorate --all && |
|
|
|
# 4 main commits |
|
git rev-list master >wc && |
|
test_line_count = 4 wc && |
|
|
|
# 3 main, 1 integrate, 1 on branch2 |
|
git rev-list p4/depot/branch2 >wc && |
|
test_line_count = 5 wc && |
|
|
|
# no branch1, since no p4 branch created for it |
|
test_must_fail git show-ref p4/depot/branch1 |
|
) |
|
' |
|
|
|
test_expect_success 'import depot, branch detection, branchList branch definition' ' |
|
test_when_finished cleanup_git && |
|
test_create_repo "$git" && |
|
( |
|
cd "$git" && |
|
git config git-p4.branchList main:branch1 && |
|
"$GITP4" clone --dest=. --detect-branches //depot@all && |
|
|
|
git log --oneline --graph --decorate --all && |
|
|
|
# 4 main commits |
|
git rev-list master >wc && |
|
test_line_count = 4 wc && |
|
|
|
# 3 main, 1 integrate, 1 on branch2 |
|
git rev-list p4/depot/branch2 >wc && |
|
test_line_count = 5 wc && |
|
|
|
# 2 main, 1 integrate, 1 on branch1 |
|
git rev-list p4/depot/branch1 >wc && |
|
test_line_count = 4 wc |
|
) |
|
' |
|
|
|
test_expect_success 'restart p4d' ' |
|
kill_p4d && |
|
start_p4d |
|
' |
|
|
|
# |
|
# 1: //depot/branch1/file1 |
|
# //depot/branch1/file2 |
|
# 2: integrate //depot/branch1/... -> //depot/branch2/... |
|
# 3: //depot/branch1/file3 |
|
# 4: //depot/branch1/file2 (edit) |
|
# 5: integrate //depot/branch1/... -> //depot/branch3/... |
|
# |
|
## Create a simple branch structure in P4 depot. |
|
test_expect_success 'add simple p4 branches' ' |
|
( |
|
cd "$cli" && |
|
mkdir branch1 && |
|
cd branch1 && |
|
echo file1 >file1 && |
|
echo file2 >file2 && |
|
p4 add file1 file2 && |
|
p4 submit -d "branch1" && |
|
p4 integrate //depot/branch1/... //depot/branch2/... && |
|
p4 submit -d "branch2" && |
|
echo file3 >file3 && |
|
p4 add file3 && |
|
p4 submit -d "add file3 in branch1" && |
|
p4 open file2 && |
|
echo update >>file2 && |
|
p4 submit -d "update file2 in branch1" && |
|
p4 integrate //depot/branch1/... //depot/branch3/... && |
|
p4 submit -d "branch3" |
|
) |
|
' |
|
|
|
# Configure branches through git-config and clone them. |
|
# All files are tested to make sure branches were cloned correctly. |
|
# Finally, make an update to branch1 on P4 side to check if it is imported |
|
# correctly by git-p4. |
|
test_expect_success 'git-p4 clone simple branches' ' |
|
test_when_finished cleanup_git && |
|
test_create_repo "$git" && |
|
( |
|
cd "$git" && |
|
git config git-p4.branchList branch1:branch2 && |
|
git config --add git-p4.branchList branch1:branch3 && |
|
"$GITP4" clone --dest=. --detect-branches //depot@all && |
|
git log --all --graph --decorate --stat && |
|
git reset --hard p4/depot/branch1 && |
|
test -f file1 && |
|
test -f file2 && |
|
test -f file3 && |
|
grep -q update file2 && |
|
git reset --hard p4/depot/branch2 && |
|
test -f file1 && |
|
test -f file2 && |
|
test ! -f file3 && |
|
test_must_fail grep -q update file2 && |
|
git reset --hard p4/depot/branch3 && |
|
test -f file1 && |
|
test -f file2 && |
|
test -f file3 && |
|
grep -q update file2 && |
|
cd "$cli" && |
|
cd branch1 && |
|
p4 edit file2 && |
|
echo file2_ >>file2 && |
|
p4 submit -d "update file2 in branch3" && |
|
cd "$git" && |
|
git reset --hard p4/depot/branch1 && |
|
"$GITP4" rebase && |
|
grep -q file2_ file2 |
|
) |
|
' |
|
|
|
test_expect_success 'kill p4d' ' |
|
kill_p4d |
|
' |
|
|
|
test_done
|
|
|