mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
6ab1d76c3c
Drop the $GITP4 variable that was used to specify the script in contrib/fast-import/. The command is called "git p4" now, not "git-p4". Note that configuration variables will remain in a section called "git-p4". Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
115 lines
2.2 KiB
Bash
Executable file
115 lines
2.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git p4 label tests'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
# Basic p4 label tests.
|
|
#
|
|
# Note: can't have more than one label per commit - others
|
|
# are silently discarded.
|
|
#
|
|
test_expect_success 'basic p4 labels' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
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" &&
|
|
|
|
echo f3 >main/file_with_\$metachar &&
|
|
p4 add main/file_with_\$metachar &&
|
|
p4 submit -d "file with metachar" &&
|
|
|
|
p4 tag -l tag_f1_only main/f1 &&
|
|
p4 tag -l tag_with\$_shell_char main/... &&
|
|
|
|
echo f4 >main/f4 &&
|
|
p4 add main/f4 &&
|
|
p4 submit -d "main/f4" &&
|
|
|
|
p4 label -i <<-EOF &&
|
|
Label: long_label
|
|
Description:
|
|
A Label first line
|
|
A Label second line
|
|
View: //depot/...
|
|
EOF
|
|
|
|
p4 tag -l long_label ... &&
|
|
|
|
p4 labels ... &&
|
|
|
|
git p4 clone --dest="$git" --detect-labels //depot@all &&
|
|
cd "$git" &&
|
|
|
|
git tag &&
|
|
git tag >taglist &&
|
|
test_line_count = 3 taglist &&
|
|
|
|
cd main &&
|
|
git checkout tag_tag_f1_only &&
|
|
! test -f f2 &&
|
|
git checkout tag_tag_with\$_shell_char &&
|
|
test -f f1 && test -f f2 && test -f file_with_\$metachar &&
|
|
|
|
git show tag_long_label | grep -q "A Label second line"
|
|
)
|
|
'
|
|
|
|
# Test some label corner cases:
|
|
#
|
|
# - two tags on the same file; both should be available
|
|
# - a tag that is only on one file; this kind of tag
|
|
# cannot be imported (at least not easily).
|
|
|
|
test_expect_failure 'two labels on the same changelist' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$cli" &&
|
|
mkdir -p main &&
|
|
|
|
p4 edit main/f1 main/f2 &&
|
|
echo "hello world" >main/f1 &&
|
|
echo "not in the tag" >main/f2 &&
|
|
p4 submit -d "main/f[12]: testing two labels" &&
|
|
|
|
p4 tag -l tag_f1_1 main/... &&
|
|
p4 tag -l tag_f1_2 main/... &&
|
|
|
|
p4 labels ... &&
|
|
|
|
git p4 clone --dest="$git" --detect-labels //depot@all &&
|
|
cd "$git" &&
|
|
|
|
git tag | grep tag_f1 &&
|
|
git tag | grep -q tag_f1_1 &&
|
|
git tag | grep -q tag_f1_2 &&
|
|
|
|
cd main &&
|
|
|
|
git checkout tag_tag_f1_1 &&
|
|
ls &&
|
|
test -f f1 &&
|
|
|
|
git checkout tag_tag_f1_2 &&
|
|
ls &&
|
|
test -f f1
|
|
)
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|