2011-08-23 04:20:33 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
2012-04-09 02:18:02 +02:00
|
|
|
test_description='git p4 tests for p4 branches'
|
2011-08-23 04:20:33 +02:00
|
|
|
|
2020-11-19 00:44:44 +01:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
2011-08-23 04:20:33 +02:00
|
|
|
. ./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 &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest="$git" //depot/main@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git log --oneline --graph --decorate --all &&
|
2020-11-19 00:44:44 +01:00
|
|
|
git rev-list main -- >wc &&
|
2011-08-23 04:20:33 +02:00
|
|
|
test_line_count = 4 wc
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'import branch1, no branch detection' '
|
|
|
|
|
test_when_finished cleanup_git &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest="$git" //depot/branch1@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git log --oneline --graph --decorate --all &&
|
2020-11-19 00:44:44 +01:00
|
|
|
git rev-list main -- >wc &&
|
2011-08-23 04:20:33 +02:00
|
|
|
test_line_count = 2 wc
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'import branch2, no branch detection' '
|
|
|
|
|
test_when_finished cleanup_git &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest="$git" //depot/branch2@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git log --oneline --graph --decorate --all &&
|
2020-11-19 00:44:44 +01:00
|
|
|
git rev-list main -- >wc &&
|
2011-08-23 04:20:33 +02:00
|
|
|
test_line_count = 2 wc
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'import depot, no branch detection' '
|
|
|
|
|
test_when_finished cleanup_git &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest="$git" //depot@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git log --oneline --graph --decorate --all &&
|
2020-11-19 00:44:44 +01:00
|
|
|
git rev-list main -- >wc &&
|
2011-08-23 04:20:33 +02:00
|
|
|
test_line_count = 8 wc
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'import depot, branch detection' '
|
|
|
|
|
test_when_finished cleanup_git &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest="$git" --detect-branches //depot@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
|
|
|
|
|
git log --oneline --graph --decorate --all &&
|
|
|
|
|
|
|
|
|
|
# 4 main commits
|
2020-11-19 00:44:44 +01:00
|
|
|
git rev-list main -- >wc &&
|
2011-08-23 04:20:33 +02:00
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
git-p4: support explicit sync of arbitrary existing git-p4 refs
With the --branch argument of the "sync" subcommand, git-p4 enables
you to import a perforce branch/path to an arbitrary git ref, using
a full ref path, or to refs/remotes/p4/* or refs/heads/p4/*,
depending on --import-local, using a short ref name.
However, when you later want to explicitly sync such a given ref to
pick up subsequent p4 changes, it only works if the ref was placed
in the p4 path *and* has only one path component (no "/").
This limitation results from a bad assumption in the
existing-branch sync logic, and also means you cannot individually
sync branches detected by --detect-branches, as these also get a
"/" in their names.
Fix "git p4 sync --branch", when called with an existing ref, so
that it works correctly regardless of whether the ref is in the p4
path or not, and (in the case of refs in the p4 path) regardless of
whether it has a "/" in its short name or not.
Also add tests to validate that these branch-specific syncs work
as expected.
Signed-off-by: Tao Klerks <tao@klerks.biz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-04 07:10:54 +02:00
|
|
|
test_expect_success 'sync specific detected branch' '
|
|
|
|
|
test_when_finished cleanup_git &&
|
|
|
|
|
git p4 clone --dest="$git" --detect-branches //depot@all &&
|
|
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git p4 sync --branch=depot/branch2 >out &&
|
|
|
|
|
test_i18ngrep "No changes to import!" out
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2011-08-23 04:20:33 +02:00
|
|
|
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 &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest=. --detect-branches //depot@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
|
|
|
|
|
git log --oneline --graph --decorate --all &&
|
|
|
|
|
|
|
|
|
|
# 4 main commits
|
2020-11-19 00:44:44 +01:00
|
|
|
git rev-list main -- >wc &&
|
2011-08-23 04:20:33 +02:00
|
|
|
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' '
|
git p4 test: clean up the p4d cleanup functions
Confusingly, the 'git p4' tests used two cleanup functions:
- 'kill_p4d' was run in the last test before 'test_done', and it not
only killed 'p4d', but it killed the watchdog process, and cleaned
up after 'p4d' as well by removing all directories used by the P4
daemon and client.
This cleanup is not necessary right before 'test_done', because
the whole trash directory is about to get removed anyway, but it
is necessary in 't9801-git-p4-branch.sh', which uses 'kill_p4d' to
stop 'p4d' before re-starting it in the middle of the test script.
- 'cleanup' was run in the trap on EXIT, and it killed 'p4d', but,
it didn't kill the watchdog process, and, contrarily to its name,
didn't perform any cleanup whatsoever.
Make it clearer what's going on by renaming and simplifying the
cleanup functions, so in the end we'll have:
- 'stop_p4d_and_watchdog' replaces 'cleanup' as it will try to live
up to its name and stop both the 'p4d' and the watchdog processes,
and as the sole function registered with 'test_atexit' it will be
responsible for no leaving any stray processes behind after 'git p4'
tests were finished or interrupted.
- 'stop_and_cleanup_p4d' replaces 'kill_p4d' as it will stop 'p4d'
(and the watchdog) and remove all directories used by the P4
daemon and cliean, so it can be used mid-script to stop and then
re-start 'p4d'.
Note that while 'cleanup' sent a single SIGKILL to 'p4d', 'kill_p4d'
was quite brutal, as it first sent SIGTERM to the daemon repeatedly,
either until its pid disappeared or until a given timeout was up, and
then it sent SIGKILL repeatedly, for good measure. This is overkill
(pardon the pun): a single SIGKILL should be able to take down any
process in a sensible state, and if a process were to somehow end up
stuck in the dreaded uninterruptible sleep state then even repeated
SIGKILLs won't bring immediate help. So ditch all the repeated
SIGTERM/SIGKILL parts, and use a single SIGKILL to stop 'p4d', and
make sure that there are no races between asynchron signal delivery
and subsequent restart of 'p4d' by waiting for it to die.
With this change the 'retry_until_fail' helper has no callers left,
remove it.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-03-13 13:24:16 +01:00
|
|
|
stop_and_cleanup_p4d &&
|
2011-08-23 04:20:33 +02:00
|
|
|
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 &&
|
2012-01-26 00:48:23 +01:00
|
|
|
p4 submit -d "Create branch1" &&
|
2011-08-23 04:20:33 +02:00
|
|
|
p4 integrate //depot/branch1/... //depot/branch2/... &&
|
2012-01-26 00:48:23 +01:00
|
|
|
p4 submit -d "Integrate branch2 from branch1" &&
|
2011-08-23 04:20:33 +02:00
|
|
|
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/... &&
|
2012-01-26 00:48:23 +01:00
|
|
|
p4 submit -d "Integrate branch3 from branch1"
|
2011-08-23 04:20:33 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# 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
|
2012-04-09 02:18:02 +02:00
|
|
|
# correctly by git p4.
|
|
|
|
|
test_expect_success 'git p4 clone simple branches' '
|
2011-08-23 04:20:33 +02:00
|
|
|
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 &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest=. --detect-branches //depot@all &&
|
2011-08-23 04:20:33 +02:00
|
|
|
git log --all --graph --decorate --stat &&
|
|
|
|
|
git reset --hard p4/depot/branch1 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
2012-01-26 00:48:23 +01:00
|
|
|
grep update file2 &&
|
2011-08-23 04:20:33 +02:00
|
|
|
git reset --hard p4/depot/branch2 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
2011-08-23 04:20:33 +02:00
|
|
|
test ! -f file3 &&
|
2012-01-26 20:40:09 +01:00
|
|
|
! grep update file2 &&
|
2011-08-23 04:20:33 +02:00
|
|
|
git reset --hard p4/depot/branch3 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
2012-01-26 00:48:23 +01:00
|
|
|
grep update file2 &&
|
2011-08-23 04:20:33 +02:00
|
|
|
cd "$cli" &&
|
|
|
|
|
cd branch1 &&
|
|
|
|
|
p4 edit file2 &&
|
|
|
|
|
echo file2_ >>file2 &&
|
2012-05-26 11:56:06 +02:00
|
|
|
p4 submit -d "update file2 in branch1" &&
|
2011-08-23 04:20:33 +02:00
|
|
|
cd "$git" &&
|
|
|
|
|
git reset --hard p4/depot/branch1 &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 rebase &&
|
2012-01-26 00:48:23 +01:00
|
|
|
grep file2_ file2
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Create a complex branch structure in P4 depot to check if they are correctly
|
2012-04-09 02:18:02 +02:00
|
|
|
# cloned. The branches are created from older changelists to check if git p4 is
|
2012-01-26 00:48:23 +01:00
|
|
|
# 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
|
2012-04-09 02:18:02 +02:00
|
|
|
test_expect_success 'git p4 add complex branches' '
|
2012-01-26 00:48:23 +01:00
|
|
|
(
|
|
|
|
|
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}"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2012-04-09 02:18:02 +02:00
|
|
|
# Configure branches through git-config and clone them. git p4 will only be able
|
2012-01-26 00:48:23 +01:00
|
|
|
# to clone the original structure if it is able to detect the origin changelist
|
|
|
|
|
# of each branch.
|
2012-04-09 02:18:02 +02:00
|
|
|
test_expect_success 'git p4 clone complex branches' '
|
2012-01-26 00:48:23 +01:00
|
|
|
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 &&
|
2012-04-09 02:18:02 +02:00
|
|
|
git p4 clone --dest=. --detect-branches //depot@all &&
|
2012-01-26 00:48:23 +01:00
|
|
|
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 &&
|
2012-01-26 20:40:09 +01:00
|
|
|
! grep update file2 &&
|
2012-01-26 00:48:23 +01:00
|
|
|
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 &&
|
2021-05-05 13:56:25 +02:00
|
|
|
git diff-tree --quiet HEAD &&
|
2012-01-26 00:48:23 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
|
|
|
|
test_path_is_missing file3 &&
|
2012-01-26 20:40:09 +01:00
|
|
|
! grep update file2 &&
|
2012-01-26 00:48:23 +01:00
|
|
|
git reset --hard p4/depot/branch5 &&
|
2021-05-05 13:56:25 +02:00
|
|
|
git diff-tree --quiet HEAD &&
|
2012-01-26 00:48:23 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
2012-01-26 20:40:09 +01:00
|
|
|
! grep update file2 &&
|
2016-06-29 09:35:27 +02:00
|
|
|
test_must_fail git show-ref --verify refs/git-p4-tmp
|
2011-08-23 04:20:33 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2012-05-26 11:56:04 +02:00
|
|
|
# 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 &&
|
2016-06-29 09:35:27 +02:00
|
|
|
test_must_fail git show-ref --verify refs/git-p4-tmp
|
2012-05-26 11:56:04 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2012-05-26 11:56:05 +02:00
|
|
|
# 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
|
|
|
|
|
)
|
|
|
|
|
'
|
2012-08-11 18:55:01 +02:00
|
|
|
|
2019-04-01 20:02:35 +02:00
|
|
|
# Check that excluded files are omitted during import
|
2019-04-01 20:02:38 +02:00
|
|
|
test_expect_success 'git p4 clone complex branches with excluded files' '
|
2019-04-01 20:02:35 +02:00
|
|
|
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/branch1/file2 -//depot/branch2/file2 -//depot/branch3/file2 -//depot/branch4/file2 -//depot/branch5/file2 -//depot/branch6/file2 //depot@all &&
|
|
|
|
|
git log --all --graph --decorate --stat &&
|
|
|
|
|
git reset --hard p4/depot/branch1 &&
|
|
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_missing file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
|
|
|
|
git reset --hard p4/depot/branch2 &&
|
|
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_missing file2 &&
|
|
|
|
|
test_path_is_missing file3 &&
|
|
|
|
|
git reset --hard p4/depot/branch3 &&
|
|
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_missing file2 &&
|
|
|
|
|
test_path_is_missing file3 &&
|
|
|
|
|
git reset --hard p4/depot/branch4 &&
|
|
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_missing file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
|
|
|
|
git reset --hard p4/depot/branch5 &&
|
|
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_missing file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
|
|
|
|
git reset --hard p4/depot/branch6 &&
|
|
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_missing file2 &&
|
|
|
|
|
test_path_is_missing file3
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2012-08-11 18:55:01 +02:00
|
|
|
# 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"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2012-08-11 18:55:04 +02:00
|
|
|
test_expect_success 'use-client-spec detect-branches files in top-level' '
|
2012-08-11 18:55:01 +02:00
|
|
|
test_when_finished cleanup_git &&
|
|
|
|
|
test_create_repo "$git" &&
|
|
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
|
2020-11-19 00:44:44 +01:00
|
|
|
git checkout -b main p4/usecs/b1 &&
|
2012-08-11 18:55:01 +02:00
|
|
|
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
|
|
|
|
|
|
2013-07-19 01:04:53 +02:00
|
|
|
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"
|
2012-08-11 18:55:01 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2013-07-19 01:04:53 +02:00
|
|
|
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 &&
|
2020-11-19 00:44:44 +01:00
|
|
|
git checkout -b main p4/usecs/b3 &&
|
2013-07-19 01:04:53 +02:00
|
|
|
test_path_is_file b1-file1 &&
|
|
|
|
|
test_path_is_file b3-file3_2 &&
|
|
|
|
|
test_path_is_missing b3-file3_1
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2015-04-22 00:49:29 +02:00
|
|
|
test_expect_success 'restart p4d' '
|
git p4 test: clean up the p4d cleanup functions
Confusingly, the 'git p4' tests used two cleanup functions:
- 'kill_p4d' was run in the last test before 'test_done', and it not
only killed 'p4d', but it killed the watchdog process, and cleaned
up after 'p4d' as well by removing all directories used by the P4
daemon and client.
This cleanup is not necessary right before 'test_done', because
the whole trash directory is about to get removed anyway, but it
is necessary in 't9801-git-p4-branch.sh', which uses 'kill_p4d' to
stop 'p4d' before re-starting it in the middle of the test script.
- 'cleanup' was run in the trap on EXIT, and it killed 'p4d', but,
it didn't kill the watchdog process, and, contrarily to its name,
didn't perform any cleanup whatsoever.
Make it clearer what's going on by renaming and simplifying the
cleanup functions, so in the end we'll have:
- 'stop_p4d_and_watchdog' replaces 'cleanup' as it will try to live
up to its name and stop both the 'p4d' and the watchdog processes,
and as the sole function registered with 'test_atexit' it will be
responsible for no leaving any stray processes behind after 'git p4'
tests were finished or interrupted.
- 'stop_and_cleanup_p4d' replaces 'kill_p4d' as it will stop 'p4d'
(and the watchdog) and remove all directories used by the P4
daemon and cliean, so it can be used mid-script to stop and then
re-start 'p4d'.
Note that while 'cleanup' sent a single SIGKILL to 'p4d', 'kill_p4d'
was quite brutal, as it first sent SIGTERM to the daemon repeatedly,
either until its pid disappeared or until a given timeout was up, and
then it sent SIGKILL repeatedly, for good measure. This is overkill
(pardon the pun): a single SIGKILL should be able to take down any
process in a sensible state, and if a process were to somehow end up
stuck in the dreaded uninterruptible sleep state then even repeated
SIGKILLs won't bring immediate help. So ditch all the repeated
SIGTERM/SIGKILL parts, and use a single SIGKILL to stop 'p4d', and
make sure that there are no races between asynchron signal delivery
and subsequent restart of 'p4d' by waiting for it to die.
With this change the 'retry_until_fail' helper has no callers left,
remove it.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-03-13 13:24:16 +01:00
|
|
|
stop_and_cleanup_p4d &&
|
2015-04-22 00:49:29 +02:00
|
|
|
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 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
|
|
|
|
test_path_is_file sub_file1 &&
|
2015-04-22 00:49:29 +02:00
|
|
|
grep update file2 &&
|
|
|
|
|
git reset --hard p4/depot/branch2 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
2015-04-22 00:49:29 +02:00
|
|
|
test ! -f file3 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file sub_file1 &&
|
2015-04-22 00:49:29 +02:00
|
|
|
! grep update file2 &&
|
|
|
|
|
git reset --hard p4/depot/branch3 &&
|
2021-03-02 19:50:56 +01:00
|
|
|
test_path_is_file file1 &&
|
|
|
|
|
test_path_is_file file2 &&
|
|
|
|
|
test_path_is_file file3 &&
|
|
|
|
|
test_path_is_file sub_file1 &&
|
2015-04-22 00:49:29 +02:00
|
|
|
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
|
2015-04-22 00:49:30 +02:00
|
|
|
test_expect_success 'Update a file in git side and submit to P4 using client view' '
|
2015-04-22 00:49:29 +02:00
|
|
|
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
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2019-04-01 20:02:21 +02:00
|
|
|
test_expect_success 'restart p4d (case folding enabled)' '
|
2019-07-10 00:25:40 +02:00
|
|
|
stop_and_cleanup_p4d &&
|
2019-04-01 20:02:21 +02:00
|
|
|
start_p4d -C1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# 1: //depot/main/mf1
|
|
|
|
|
# 2: integrate //depot/main/... -> //depot/branch1/...
|
|
|
|
|
# 3: //depot/main/mf2
|
|
|
|
|
# 4: //depot/BRANCH1/B1f3
|
|
|
|
|
# 5: //depot/branch1/b1f4
|
|
|
|
|
#
|
|
|
|
|
test_expect_success !CASE_INSENSITIVE_FS 'basic p4 branches for case folding' '
|
|
|
|
|
(
|
|
|
|
|
cd "$cli" &&
|
|
|
|
|
mkdir -p main &&
|
|
|
|
|
|
|
|
|
|
echo mf1 >main/mf1 &&
|
|
|
|
|
p4 add main/mf1 &&
|
|
|
|
|
p4 submit -d "main/mf1" &&
|
|
|
|
|
|
|
|
|
|
p4 integrate //depot/main/... //depot/branch1/... &&
|
|
|
|
|
p4 submit -d "integrate main to branch1" &&
|
|
|
|
|
|
|
|
|
|
echo mf2 >main/mf2 &&
|
|
|
|
|
p4 add main/mf2 &&
|
|
|
|
|
p4 submit -d "main/mf2" &&
|
|
|
|
|
|
|
|
|
|
mkdir BRANCH1 &&
|
|
|
|
|
echo B1f3 >BRANCH1/B1f3 &&
|
|
|
|
|
p4 add BRANCH1/B1f3 &&
|
|
|
|
|
p4 submit -d "BRANCH1/B1f3" &&
|
|
|
|
|
|
|
|
|
|
echo b1f4 >branch1/b1f4 &&
|
|
|
|
|
p4 add branch1/b1f4 &&
|
|
|
|
|
p4 submit -d "branch1/b1f4"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Check that files are properly split across branches when ignorecase is set
|
2019-04-01 20:02:24 +02:00
|
|
|
test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone, branchList branch definition, ignorecase' '
|
2019-04-01 20:02:21 +02:00
|
|
|
test_when_finished cleanup_git &&
|
|
|
|
|
test_create_repo "$git" &&
|
|
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git config git-p4.branchList main:branch1 &&
|
|
|
|
|
git config --type=bool core.ignoreCase true &&
|
|
|
|
|
git p4 clone --dest=. --detect-branches //depot@all &&
|
|
|
|
|
|
|
|
|
|
git log --all --graph --decorate --stat &&
|
|
|
|
|
|
|
|
|
|
git reset --hard p4/master &&
|
|
|
|
|
test_path_is_file mf1 &&
|
|
|
|
|
test_path_is_file mf2 &&
|
|
|
|
|
test_path_is_missing B1f3 &&
|
|
|
|
|
test_path_is_missing b1f4 &&
|
|
|
|
|
|
|
|
|
|
git reset --hard p4/depot/branch1 &&
|
|
|
|
|
test_path_is_file mf1 &&
|
|
|
|
|
test_path_is_missing mf2 &&
|
|
|
|
|
test_path_is_file B1f3 &&
|
|
|
|
|
test_path_is_file b1f4
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Check that files are properly split across branches when ignorecase is set, use-client-spec case
|
2019-04-01 20:02:24 +02:00
|
|
|
test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone with client-spec, branchList branch definition, ignorecase' '
|
2019-04-01 20:02:21 +02:00
|
|
|
client_view "//depot/... //client/..." &&
|
|
|
|
|
test_when_finished cleanup_git &&
|
|
|
|
|
test_create_repo "$git" &&
|
|
|
|
|
(
|
|
|
|
|
cd "$git" &&
|
|
|
|
|
git config git-p4.branchList main:branch1 &&
|
|
|
|
|
git config --type=bool core.ignoreCase true &&
|
|
|
|
|
git p4 clone --dest=. --use-client-spec --detect-branches //depot@all &&
|
|
|
|
|
|
|
|
|
|
git log --all --graph --decorate --stat &&
|
|
|
|
|
|
|
|
|
|
git reset --hard p4/master &&
|
|
|
|
|
test_path_is_file mf1 &&
|
|
|
|
|
test_path_is_file mf2 &&
|
|
|
|
|
test_path_is_missing B1f3 &&
|
|
|
|
|
test_path_is_missing b1f4 &&
|
|
|
|
|
|
|
|
|
|
git reset --hard p4/depot/branch1 &&
|
|
|
|
|
test_path_is_file mf1 &&
|
|
|
|
|
test_path_is_missing mf2 &&
|
|
|
|
|
test_path_is_file B1f3 &&
|
|
|
|
|
test_path_is_file b1f4
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2011-08-23 04:20:33 +02:00
|
|
|
test_done
|