3 test_description
='git-p4 tests'
7 ( p4
-h && p4d
-h ) >/dev
/null
2>&1 ||
{
8 skip_all
='skipping git-p4 tests; no p4 or p4d'
12 GITP4
=$GIT_BUILD_DIR/contrib
/fast-import
/git-p4
15 export P4PORT
=localhost
:$P4DPORT
17 db
="$TRASH_DIRECTORY/db"
18 cli
="$TRASH_DIRECTORY/cli"
19 git
="$TRASH_DIRECTORY/git"
21 test_debug
'echo p4d -q -d -r "$db" -p $P4DPORT'
22 test_expect_success setup
'
24 p4d -q -d -r "$db" -p $P4DPORT &&
27 export P4PORT=localhost:$P4DPORT
30 test_expect_success
'add p4 files' '
32 p4 client -i <<-EOF &&
36 View: //depot/... //client/...
38 export P4CLIENT=client &&
41 p4 submit -d "file1" &&
44 p4 submit -d "file2" &&
49 cd "$TRASH_DIRECTORY" &&
54 test_expect_success
'basic git-p4 clone' '
55 "$GITP4" clone --dest="$git" //depot &&
56 test_when_finished cleanup_git &&
58 git log --oneline >lines &&
59 test_line_count = 1 lines
62 test_expect_success
'git-p4 clone @all' '
63 "$GITP4" clone --dest="$git" //depot@all &&
64 test_when_finished cleanup_git &&
66 git log --oneline >lines &&
67 test_line_count = 2 lines
70 test_expect_success
'git-p4 sync uninitialized repo' '
71 test_create_repo "$git" &&
72 test_when_finished cleanup_git &&
74 test_must_fail "$GITP4" sync
78 # Create a git repo by hand. Add a commit so that HEAD is valid.
79 # Test imports a new p4 repository into a new git branch.
81 test_expect_success
'git-p4 sync new branch' '
82 test_create_repo "$git" &&
83 test_when_finished cleanup_git &&
86 "$GITP4" sync --branch=refs/remotes/p4/depot //depot@all &&
87 git log --oneline p4/depot >lines &&
88 test_line_count = 2 lines
91 test_expect_success
'exit when p4 fails to produce marshaled output' '
92 badp4dir="$TRASH_DIRECTORY/badp4dir" &&
93 mkdir -p "$badp4dir" &&
94 test_when_finished "rm -rf $badp4dir" &&
95 cat >"$badp4dir"/p4 <<-EOF &&
99 chmod 755 "$badp4dir"/p4 &&
100 PATH="$badp4dir:$PATH" "$GITP4" clone --dest="$git" //depot >errs 2>&1 ; retval=$? &&
101 test $retval -eq 1 &&
102 test_must_fail grep -q Traceback errs
105 test_expect_success
'add p4 files with wildcards in the names' '
107 echo file-wild-hash >file-wild#hash &&
108 echo file-wild-star >file-wild\*star &&
109 echo file-wild-at >file-wild@at &&
110 echo file-wild-percent >file-wild%percent &&
111 p4 add -f file-wild* &&
112 p4 submit -d "file wildcards"
115 test_expect_success
'wildcard files git-p4 clone' '
116 "$GITP4" clone --dest="$git" //depot &&
117 test_when_finished cleanup_git &&
119 test -f file-wild#hash &&
120 test -f file-wild\*star &&
121 test -f file-wild@at &&
122 test -f file-wild%percent
125 test_expect_success
'clone bare' '
126 "$GITP4" clone --dest="$git" --bare //depot &&
127 test_when_finished cleanup_git &&
130 bare=`git config --get core.bare` &&
137 p4 user
-f -i <<EOF &&
139 Email: $name@localhost
142 p4 passwd
-P secret
$name
148 awk "{print}END{print \" admin user $name * //depot/...\"}" |\
152 p4_check_commit_author
() {
155 if p4 changes
-m 1 //depot
/$file |
grep $user > /dev
/null
; then
158 echo "file $file not modified by user $user" 1>&2
163 make_change_by_user
() {
164 file=$1 name
=$2 email
=$3 &&
165 echo "username: a change by $name" >>"$file" &&
167 git commit
--author "$name <$email>" -m "a change by $name"
170 # Test username support, submitting as user 'alice'
171 test_expect_success
'preserve users' '
172 p4_add_user alice Alice &&
173 p4_add_user bob Bob &&
174 p4_grant_admin alice &&
175 "$GITP4" clone --dest="$git" //depot &&
176 test_when_finished cleanup_git &&
178 echo "username: a change by alice" >> file1 &&
179 echo "username: a change by bob" >> file2 &&
180 git commit --author "Alice <alice@localhost>" -m "a change by alice" file1 &&
181 git commit --author "Bob <bob@localhost>" -m "a change by bob" file2 &&
182 git config git-p4.skipSubmitEditCheck true &&
183 P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit --preserve-user &&
184 p4_check_commit_author file1 alice &&
185 p4_check_commit_author file2 bob
188 # Test username support, submitting as bob, who lacks admin rights. Should
189 # not submit change to p4 (git diff should show deltas).
190 test_expect_success
'refuse to preserve users without perms' '
191 "$GITP4" clone --dest="$git" //depot &&
192 test_when_finished cleanup_git &&
194 git config git-p4.skipSubmitEditCheck true &&
195 echo "username-noperms: a change by alice" >> file1 &&
196 git commit --author "Alice <alice@localhost>" -m "perms: a change by alice" file1 &&
197 ! P4EDITOR=touch P4USER=bob P4PASSWD=secret "$GITP4" commit --preserve-user &&
198 ! git diff --exit-code HEAD..p4/master > /dev/null
201 # What happens with unknown author? Without allowMissingP4Users it should fail.
202 test_expect_success
'preserve user where author is unknown to p4' '
203 "$GITP4" clone --dest="$git" //depot &&
204 test_when_finished cleanup_git &&
206 git config git-p4.skipSubmitEditCheck true &&
207 echo "username-bob: a change by bob" >> file1 &&
208 git commit --author "Bob <bob@localhost>" -m "preserve: a change by bob" file1 &&
209 echo "username-unknown: a change by charlie" >> file1 &&
210 git commit --author "Charlie <charlie@localhost>" -m "preserve: a change by charlie" file1 &&
211 ! P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit --preserve-user &&
212 ! git diff --exit-code HEAD..p4/master > /dev/null &&
213 echo "$0: repeat with allowMissingP4Users enabled" &&
214 git config git-p4.allowMissingP4Users true &&
215 git config git-p4.preserveUser true &&
216 P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit &&
217 git diff --exit-code HEAD..p4/master > /dev/null &&
218 p4_check_commit_author file1 alice
221 # If we're *not* using --preserve-user, git-p4 should warn if we're submitting
222 # changes that are not all ours.
223 # Test: user in p4 and user unknown to p4.
224 # Test: warning disabled and user is the same.
225 test_expect_success
'not preserving user with mixed authorship' '
226 "$GITP4" clone --dest="$git" //depot &&
227 test_when_finished cleanup_git &&
229 git config git-p4.skipSubmitEditCheck true &&
230 p4_add_user derek Derek &&
232 make_change_by_user usernamefile3 Derek derek@localhost &&
233 P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
234 grep "git author derek@localhost does not match" actual &&
236 make_change_by_user usernamefile3 Charlie charlie@localhost &&
237 P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
238 grep "git author charlie@localhost does not match" actual &&
240 make_change_by_user usernamefile3 alice alice@localhost &&
241 P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
242 ! grep "git author.*does not match" actual &&
244 git config git-p4.skipUserNameCheck true &&
245 make_change_by_user usernamefile3 Charlie charlie@localhost &&
246 P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
247 ! grep "git author.*does not match" actual &&
249 p4_check_commit_author usernamefile3 alice
254 python
-c 'import marshal, sys; d = marshal.load(sys.stdin); print d["'$what'"]'
257 # Sleep a bit so that the top-most p4 change did not happen "now". Then
258 # import the repo and make sure that the initial import has the same time
259 # as the top-most change.
260 test_expect_success
'initial import time from top change time' '
261 p4change=$(p4 -G changes -m 1 //depot/... | marshal_dump change) &&
262 p4time=$(p4 -G changes -m 1 //depot/... | marshal_dump time) &&
264 "$GITP4" clone --dest="$git" //depot &&
265 test_when_finished cleanup_git &&
267 gittime=$(git show -s --raw --pretty=format:%at HEAD) &&
268 echo $p4time $gittime &&
269 test $p4time = $gittime
272 test_expect_success
'shutdown' '
273 pid=`pgrep -f p4d` &&
275 test_debug "ps wl `echo $pid`" &&