t/t9801-git-p4-branch.sh - jrn/git - Git at Google

 #!/bin/sh

 test_description='git p4 tests for p4 branches'

 . ./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 &&
 	git p4 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 &&
 	git p4 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 &&
 	git p4 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 &&
 	git p4 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 &&
 	git p4 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 &&
 		git p4 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 "Create branch1" &&
 		p4 integrate //depot/branch1/... //depot/branch2/... &&
 		p4 submit -d "Integrate branch2 from branch1" &&
 		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 "Integrate branch3 from branch1"
 	)
 '

 # 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 &&
 		git p4 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 update file2 &&
 		git reset --hard p4/depot/branch2 &&
 		test -f file1 &&
 		test -f file2 &&
 		test ! -f file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
 		test -f file1 &&
 		test -f file2 &&
 		test -f file3 &&
 		grep update file2 &&
 		cd "$cli" &&
 		cd branch1 &&
 		p4 edit file2 &&
 		echo file2_ >>file2 &&
 		p4 submit -d "update file2 in branch1" &&
 		cd "$git" &&
 		git reset --hard p4/depot/branch1 &&
 		git p4 rebase &&
 		grep file2_ file2
 	)
 '

 # Create a complex branch structure in P4 depot to check if they are correctly
 # cloned. The branches are created from older changelists to check if git p4 is
 # able to correctly detect them.
 # The final expected structure is:
 # `branch1
 # | `- file1
 # | `- file2 (updated)
 # | `- file3
 # `branch2
 # | `- file1
 # | `- file2
 # `branch3
 # | `- file1
 # | `- file2 (updated)
 # | `- file3
 # `branch4
 # | `- file1
 # | `- file2
 # `branch5
 #   `- file1
 #   `- file2
 #   `- file3
 test_expect_success 'git p4 add complex branches' '
 	(
 		cd "$cli" &&
 		changelist=$(p4 changes -m1 //depot/... | cut -d" " -f2) &&
 		changelist=$(($changelist - 5)) &&
 		p4 integrate //depot/branch1/...@$changelist //depot/branch4/... &&
 		p4 submit -d "Integrate branch4 from branch1@${changelist}" &&
 		changelist=$(($changelist + 2)) &&
 		p4 integrate //depot/branch1/...@$changelist //depot/branch5/... &&
 		p4 submit -d "Integrate branch5 from branch1@${changelist}"
 	)
 '

 # Configure branches through git-config and clone them. git p4 will only be able
 # to clone the original structure if it is able to detect the origin changelist
 # of each branch.
 test_expect_success 'git p4 clone complex 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 &&
 		git config --add git-p4.branchList branch1:branch4 &&
 		git config --add git-p4.branchList branch1:branch5 &&
 		git p4 clone --dest=. --detect-branches //depot@all &&
 		git log --all --graph --decorate --stat &&
 		git reset --hard p4/depot/branch1 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch2 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch4 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch5 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
 		test_must_fail git show-ref --verify refs/git-p4-tmp
 	)
 '

 # Move branch3/file3 to branch4/file3 in a single changelist
 test_expect_success 'git p4 submit to two branches in a single changelist' '
 	(
 		cd "$cli" &&
 		p4 integrate //depot/branch3/file3 //depot/branch4/file3 &&
 		p4 delete //depot/branch3/file3 &&
 		p4 submit -d "Move branch3/file3 to branch4/file3"
 	)
 '

 # Confirm that changes to two branches done in a single changelist
 # are correctly imported by git p4
 test_expect_success 'git p4 sync changes to two branches in the same changelist' '
 	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 &&
 		git config --add git-p4.branchList branch1:branch4 &&
 		git config --add git-p4.branchList branch1:branch5 &&
 		git p4 clone --dest=. --detect-branches //depot@all &&
 		git log --all --graph --decorate --stat &&
 		git reset --hard p4/depot/branch1 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch2 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch4 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch5 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
 		test_must_fail git show-ref --verify refs/git-p4-tmp
 	)
 '

 # Create a branch by integrating a single file
 test_expect_success 'git p4 file subset branch' '
 	(
 		cd "$cli" &&
 		p4 integrate //depot/branch1/file1 //depot/branch6/file1 &&
 		p4 submit -d "Integrate file1 alone from branch1 to branch6"
 	)
 '

 # Check if git p4 creates a new branch containing a single file,
 # instead of keeping the old files from the original branch
 test_expect_failure 'git p4 clone file subset branch' '
 	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 &&
 		git config --add git-p4.branchList branch1:branch4 &&
 		git config --add git-p4.branchList branch1:branch5 &&
 		git config --add git-p4.branchList branch1:branch6 &&
 		git p4 clone --dest=. --detect-branches //depot@all &&
 		git log --all --graph --decorate --stat &&
 		git reset --hard p4/depot/branch1 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch2 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch4 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch5 &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch6 &&
 		test_path_is_file file1 &&
 		test_path_is_missing file2 &&
 		test_path_is_missing file3
 	)
 '

 # From a report in http://stackoverflow.com/questions/11893688
 # where --use-client-spec caused branch prefixes not to be removed;
 # every file in git appeared into a subdirectory of the branch name.
 test_expect_success 'use-client-spec detect-branches setup' '
 	rm -rf "$cli" &&
 	mkdir "$cli" &&
 	(
 		cd "$cli" &&
 		client_view "//depot/usecs/... //client/..." &&
 		mkdir b1 &&
 		echo b1/b1-file1 >b1/b1-file1 &&
 		p4 add b1/b1-file1 &&
 		p4 submit -d "b1/b1-file1" &&

 		p4 integrate //depot/usecs/b1/... //depot/usecs/b2/... &&
 		p4 submit -d "b1 -> b2" &&
 		p4 branch -i <<-EOF &&
 		Branch: b2
 		View: //depot/usecs/b1/... //depot/usecs/b2/...
 		EOF

 		echo b2/b2-file2 >b2/b2-file2 &&
 		p4 add b2/b2-file2 &&
 		p4 submit -d "b2/b2-file2"
 	)
 '

 test_expect_success 'use-client-spec detect-branches files in top-level' '
 	test_when_finished cleanup_git &&
 	test_create_repo "$git" &&
 	(
 		cd "$git" &&
 		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
 		git checkout -b master p4/usecs/b1 &&
 		test_path_is_file b1-file1 &&
 		test_path_is_missing b2-file2 &&
 		test_path_is_missing b1 &&
 		test_path_is_missing b2 &&

 		git checkout -b b2 p4/usecs/b2 &&
 		test_path_is_file b1-file1 &&
 		test_path_is_file b2-file2 &&
 		test_path_is_missing b1 &&
 		test_path_is_missing b2
 	)
 '

 test_expect_success 'use-client-spec detect-branches skips branches setup' '
 	(
 		cd "$cli" &&

 		p4 integrate //depot/usecs/b1/... //depot/usecs/b3/... &&
 		p4 submit -d "b1 -> b3" &&
 		p4 branch -i <<-EOF &&
 		Branch: b3
 		View: //depot/usecs/b1/... //depot/usecs/b3/...
 		EOF

 		echo b3/b3-file3_1 >b3/b3-file3_1 &&
 		echo b3/b3-file3_2 >b3/b3-file3_2 &&
 		p4 add b3/b3-file3_1 &&
 		p4 add b3/b3-file3_2 &&
 		p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
 	)
 '

 test_expect_success 'use-client-spec detect-branches skips branches' '
 	client_view "//depot/usecs/... //client/..." \
 		    "-//depot/usecs/b3/... //client/b3/..." &&
 	test_when_finished cleanup_git &&
 	test_create_repo "$git" &&
 	(
 		cd "$git" &&
 		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
 		test_must_fail git rev-parse refs/remotes/p4/usecs/b3
 	)
 '

 test_expect_success 'use-client-spec detect-branches skips files in branches' '
 	client_view "//depot/usecs/... //client/..." \
 		    "-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
 	test_when_finished cleanup_git &&
 	test_create_repo "$git" &&
 	(
 		cd "$git" &&
 		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
 		git checkout -b master p4/usecs/b3 &&
 		test_path_is_file b1-file1 &&
 		test_path_is_file b3-file3_2 &&
 		test_path_is_missing b3-file3_1
 	)
 '

 test_expect_success 'restart p4d' '
 	kill_p4d &&
 	start_p4d
 '

 #
 # 1: //depot/branch1/base/file1
 #    //depot/branch1/base/file2
 #    //depot/branch1/base/dir/sub_file1
 # 2: integrate //depot/branch1/base/... -> //depot/branch2/base/...
 # 3: //depot/branch1/base/file3
 # 4: //depot/branch1/base/file2 (edit)
 # 5: integrate //depot/branch1/base/... -> //depot/branch3/base/...
 #
 # Note: the client view removes the "base" folder from the workspace
 #       and moves sub_file1 one level up.
 test_expect_success 'add simple p4 branches with common base folder on each branch' '
 	(
 		cd "$cli" &&
 		client_view "//depot/branch1/base/... //client/branch1/..." \
 			    "//depot/branch1/base/dir/sub_file1 //client/branch1/sub_file1" \
 			    "//depot/branch2/base/... //client/branch2/..." \
 			    "//depot/branch3/base/... //client/branch3/..." &&
 		mkdir -p branch1 &&
 		cd branch1 &&
 		echo file1 >file1 &&
 		echo file2 >file2 &&
 		mkdir dir &&
 		echo sub_file1 >sub_file1 &&
 		p4 add file1 file2 sub_file1 &&
 		p4 submit -d "Create branch1" &&
 		p4 integrate //depot/branch1/base/... //depot/branch2/base/... &&
 		p4 submit -d "Integrate branch2 from branch1" &&
 		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/base/... //depot/branch3/base/... &&
 		p4 submit -d "Integrate branch3 from branch1"
 	)
 '

 # 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.
 # git p4 is expected to use the client view to also not include the common
 # "base" folder in the imported directory structure.
 test_expect_success 'git p4 clone simple branches with base folder on server side' '
 	test_create_repo "$git" &&
 	(
 		cd "$git" &&
 		git config git-p4.branchList branch1:branch2 &&
 		git config --add git-p4.branchList branch1:branch3 &&
 		git p4 clone --dest=. --use-client-spec  --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 &&
 		test -f sub_file1 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch2 &&
 		test -f file1 &&
 		test -f file2 &&
 		test ! -f file3 &&
 		test -f sub_file1 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
 		test -f file1 &&
 		test -f file2 &&
 		test -f file3 &&
 		test -f sub_file1 &&
 		grep update file2 &&
 		cd "$cli" &&
 		cd branch1 &&
 		p4 edit file2 &&
 		echo file2_ >>file2 &&
 		p4 submit -d "update file2 in branch1" &&
 		cd "$git" &&
 		git reset --hard p4/depot/branch1 &&
 		git p4 rebase &&
 		grep file2_ file2
 	)
 '

 # Now update a file in one of the branches in git and submit to P4
 test_expect_success 'Update a file in git side and submit to P4 using client view' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
 		git reset --hard p4/depot/branch1 &&
 		echo "client spec" >> file1 &&
 		git add -u . &&
 		git commit -m "update file1 in branch1" &&
 		git config git-p4.skipSubmitEdit true &&
 		git p4 submit --verbose &&
 		cd "$cli" &&
 		p4 sync ... &&
 		cd branch1 &&
 		grep "client spec" file1
 	)
 '

 test_expect_success 'kill p4d' '
 	kill_p4d
 '

 test_done
	#!/bin/sh

	test_description='git p4 tests for p4 branches'

	. ./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 &&
	git p4 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 &&
	git p4 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 &&
	git p4 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 &&
	git p4 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 &&
	git p4 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 &&
	git p4 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 "Create branch1" &&
	p4 integrate //depot/branch1/... //depot/branch2/... &&
	p4 submit -d "Integrate branch2 from branch1" &&
	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 "Integrate branch3 from branch1"
	)
	'

	# 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 &&
	git p4 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 update file2 &&
	git reset --hard p4/depot/branch2 &&
	test -f file1 &&
	test -f file2 &&
	test ! -f file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch3 &&
	test -f file1 &&
	test -f file2 &&
	test -f file3 &&
	grep update file2 &&
	cd "$cli" &&
	cd branch1 &&
	p4 edit file2 &&
	echo file2_ >>file2 &&
	p4 submit -d "update file2 in branch1" &&
	cd "$git" &&
	git reset --hard p4/depot/branch1 &&
	git p4 rebase &&
	grep file2_ file2
	)
	'

	# Create a complex branch structure in P4 depot to check if they are correctly
	# cloned. The branches are created from older changelists to check if git p4 is
	# able to correctly detect them.
	# The final expected structure is:
	# `branch1
	# \| `- file1
	# \| `- file2 (updated)
	# \| `- file3
	# `branch2
	# \| `- file1
	# \| `- file2
	# `branch3
	# \| `- file1
	# \| `- file2 (updated)
	# \| `- file3
	# `branch4
	# \| `- file1
	# \| `- file2
	# `branch5
	# `- file1
	# `- file2
	# `- file3
	test_expect_success 'git p4 add complex branches' '
	(
	cd "$cli" &&
	changelist=$(p4 changes -m1 //depot/... \| cut -d" " -f2) &&
	changelist=$(($changelist - 5)) &&
	p4 integrate //depot/branch1/...@$changelist //depot/branch4/... &&
	p4 submit -d "Integrate branch4 from branch1@${changelist}" &&
	changelist=$(($changelist + 2)) &&
	p4 integrate //depot/branch1/...@$changelist //depot/branch5/... &&
	p4 submit -d "Integrate branch5 from branch1@${changelist}"
	)
	'

	# Configure branches through git-config and clone them. git p4 will only be able
	# to clone the original structure if it is able to detect the origin changelist
	# of each branch.
	test_expect_success 'git p4 clone complex 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 &&
	git config --add git-p4.branchList branch1:branch4 &&
	git config --add git-p4.branchList branch1:branch5 &&
	git p4 clone --dest=. --detect-branches //depot@all &&
	git log --all --graph --decorate --stat &&
	git reset --hard p4/depot/branch1 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	grep update file2 &&
	git reset --hard p4/depot/branch2 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_missing file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch3 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	grep update file2 &&
	git reset --hard p4/depot/branch4 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_missing file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch5 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	! grep update file2 &&
	test_must_fail git show-ref --verify refs/git-p4-tmp
	)
	'

	# Move branch3/file3 to branch4/file3 in a single changelist
	test_expect_success 'git p4 submit to two branches in a single changelist' '
	(
	cd "$cli" &&
	p4 integrate //depot/branch3/file3 //depot/branch4/file3 &&
	p4 delete //depot/branch3/file3 &&
	p4 submit -d "Move branch3/file3 to branch4/file3"
	)
	'

	# Confirm that changes to two branches done in a single changelist
	# are correctly imported by git p4
	test_expect_success 'git p4 sync changes to two branches in the same changelist' '
	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 &&
	git config --add git-p4.branchList branch1:branch4 &&
	git config --add git-p4.branchList branch1:branch5 &&
	git p4 clone --dest=. --detect-branches //depot@all &&
	git log --all --graph --decorate --stat &&
	git reset --hard p4/depot/branch1 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	grep update file2 &&
	git reset --hard p4/depot/branch2 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_missing file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch3 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_missing file3 &&
	grep update file2 &&
	git reset --hard p4/depot/branch4 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch5 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	! grep update file2 &&
	test_must_fail git show-ref --verify refs/git-p4-tmp
	)
	'

	# Create a branch by integrating a single file
	test_expect_success 'git p4 file subset branch' '
	(
	cd "$cli" &&
	p4 integrate //depot/branch1/file1 //depot/branch6/file1 &&
	p4 submit -d "Integrate file1 alone from branch1 to branch6"
	)
	'

	# Check if git p4 creates a new branch containing a single file,
	# instead of keeping the old files from the original branch
	test_expect_failure 'git p4 clone file subset branch' '
	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 &&
	git config --add git-p4.branchList branch1:branch4 &&
	git config --add git-p4.branchList branch1:branch5 &&
	git config --add git-p4.branchList branch1:branch6 &&
	git p4 clone --dest=. --detect-branches //depot@all &&
	git log --all --graph --decorate --stat &&
	git reset --hard p4/depot/branch1 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	grep update file2 &&
	git reset --hard p4/depot/branch2 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_missing file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch3 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_missing file3 &&
	grep update file2 &&
	git reset --hard p4/depot/branch4 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch5 &&
	test_path_is_file file1 &&
	test_path_is_file file2 &&
	test_path_is_file file3 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch6 &&
	test_path_is_file file1 &&
	test_path_is_missing file2 &&
	test_path_is_missing file3
	)
	'

	# From a report in http://stackoverflow.com/questions/11893688
	# where --use-client-spec caused branch prefixes not to be removed;
	# every file in git appeared into a subdirectory of the branch name.
	test_expect_success 'use-client-spec detect-branches setup' '
	rm -rf "$cli" &&
	mkdir "$cli" &&
	(
	cd "$cli" &&
	client_view "//depot/usecs/... //client/..." &&
	mkdir b1 &&
	echo b1/b1-file1 >b1/b1-file1 &&
	p4 add b1/b1-file1 &&
	p4 submit -d "b1/b1-file1" &&

	p4 integrate //depot/usecs/b1/... //depot/usecs/b2/... &&
	p4 submit -d "b1 -> b2" &&
	p4 branch -i <<-EOF &&
	Branch: b2
	View: //depot/usecs/b1/... //depot/usecs/b2/...
	EOF

	echo b2/b2-file2 >b2/b2-file2 &&
	p4 add b2/b2-file2 &&
	p4 submit -d "b2/b2-file2"
	)
	'

	test_expect_success 'use-client-spec detect-branches files in top-level' '
	test_when_finished cleanup_git &&
	test_create_repo "$git" &&
	(
	cd "$git" &&
	git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
	git checkout -b master p4/usecs/b1 &&
	test_path_is_file b1-file1 &&
	test_path_is_missing b2-file2 &&
	test_path_is_missing b1 &&
	test_path_is_missing b2 &&

	git checkout -b b2 p4/usecs/b2 &&
	test_path_is_file b1-file1 &&
	test_path_is_file b2-file2 &&
	test_path_is_missing b1 &&
	test_path_is_missing b2
	)
	'

	test_expect_success 'use-client-spec detect-branches skips branches setup' '
	(
	cd "$cli" &&

	p4 integrate //depot/usecs/b1/... //depot/usecs/b3/... &&
	p4 submit -d "b1 -> b3" &&
	p4 branch -i <<-EOF &&
	Branch: b3
	View: //depot/usecs/b1/... //depot/usecs/b3/...
	EOF

	echo b3/b3-file3_1 >b3/b3-file3_1 &&
	echo b3/b3-file3_2 >b3/b3-file3_2 &&
	p4 add b3/b3-file3_1 &&
	p4 add b3/b3-file3_2 &&
	p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
	)
	'

	test_expect_success 'use-client-spec detect-branches skips branches' '
	client_view "//depot/usecs/... //client/..." \
	"-//depot/usecs/b3/... //client/b3/..." &&
	test_when_finished cleanup_git &&
	test_create_repo "$git" &&
	(
	cd "$git" &&
	git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
	test_must_fail git rev-parse refs/remotes/p4/usecs/b3
	)
	'

	test_expect_success 'use-client-spec detect-branches skips files in branches' '
	client_view "//depot/usecs/... //client/..." \
	"-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
	test_when_finished cleanup_git &&
	test_create_repo "$git" &&
	(
	cd "$git" &&
	git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
	git checkout -b master p4/usecs/b3 &&
	test_path_is_file b1-file1 &&
	test_path_is_file b3-file3_2 &&
	test_path_is_missing b3-file3_1
	)
	'

	test_expect_success 'restart p4d' '
	kill_p4d &&
	start_p4d
	'

	#
	# 1: //depot/branch1/base/file1
	# //depot/branch1/base/file2
	# //depot/branch1/base/dir/sub_file1
	# 2: integrate //depot/branch1/base/... -> //depot/branch2/base/...
	# 3: //depot/branch1/base/file3
	# 4: //depot/branch1/base/file2 (edit)
	# 5: integrate //depot/branch1/base/... -> //depot/branch3/base/...
	#
	# Note: the client view removes the "base" folder from the workspace
	# and moves sub_file1 one level up.
	test_expect_success 'add simple p4 branches with common base folder on each branch' '
	(
	cd "$cli" &&
	client_view "//depot/branch1/base/... //client/branch1/..." \
	"//depot/branch1/base/dir/sub_file1 //client/branch1/sub_file1" \
	"//depot/branch2/base/... //client/branch2/..." \
	"//depot/branch3/base/... //client/branch3/..." &&
	mkdir -p branch1 &&
	cd branch1 &&
	echo file1 >file1 &&
	echo file2 >file2 &&
	mkdir dir &&
	echo sub_file1 >sub_file1 &&
	p4 add file1 file2 sub_file1 &&
	p4 submit -d "Create branch1" &&
	p4 integrate //depot/branch1/base/... //depot/branch2/base/... &&
	p4 submit -d "Integrate branch2 from branch1" &&
	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/base/... //depot/branch3/base/... &&
	p4 submit -d "Integrate branch3 from branch1"
	)
	'

	# 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.
	# git p4 is expected to use the client view to also not include the common
	# "base" folder in the imported directory structure.
	test_expect_success 'git p4 clone simple branches with base folder on server side' '
	test_create_repo "$git" &&
	(
	cd "$git" &&
	git config git-p4.branchList branch1:branch2 &&
	git config --add git-p4.branchList branch1:branch3 &&
	git p4 clone --dest=. --use-client-spec --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 &&
	test -f sub_file1 &&
	grep update file2 &&
	git reset --hard p4/depot/branch2 &&
	test -f file1 &&
	test -f file2 &&
	test ! -f file3 &&
	test -f sub_file1 &&
	! grep update file2 &&
	git reset --hard p4/depot/branch3 &&
	test -f file1 &&
	test -f file2 &&
	test -f file3 &&
	test -f sub_file1 &&
	grep update file2 &&
	cd "$cli" &&
	cd branch1 &&
	p4 edit file2 &&
	echo file2_ >>file2 &&
	p4 submit -d "update file2 in branch1" &&
	cd "$git" &&
	git reset --hard p4/depot/branch1 &&
	git p4 rebase &&
	grep file2_ file2
	)
	'

	# Now update a file in one of the branches in git and submit to P4
	test_expect_success 'Update a file in git side and submit to P4 using client view' '
	test_when_finished cleanup_git &&
	(
	cd "$git" &&
	git reset --hard p4/depot/branch1 &&
	echo "client spec" >> file1 &&
	git add -u . &&
	git commit -m "update file1 in branch1" &&
	git config git-p4.skipSubmitEdit true &&
	git p4 submit --verbose &&
	cd "$cli" &&
	p4 sync ... &&
	cd branch1 &&
	grep "client spec" file1
	)
	'

	test_expect_success 'kill p4d' '
	kill_p4d
	'

	test_done