development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 06:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-p4: test and document --use-client-spec

Browse source 
The depot path is required, even with this option.  Make sure
git-p4 fails and exits with non-zero.

Contents in the specified depot path will be rearranged according
to the client spec.  Test this and add a note in the docs.

Leave an XXX suggesting that this is somewhat confusing behavior
that might be good to fix later.

Function stripRepoPath() looks at self.useClientSpec.  Make sure
this is set both for command-line option --use-client-spec and
for configuration variable git-p4.useClientSpec.  Test this.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff 2011-12-24 21:07:39 -05:00 committed by Junio C Hamano
parent ae3f41f20a
commit 09fca77b9e
3 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-p4.txt
View file

@ -232,7 +232,10 @@ git repository:
Use a client spec to find the list of interesting files in p4.
The client spec is discovered using 'p4 client -o' which checks
the 'P4CLIENT' environment variable and returns a mapping of
depot files to workspace files.
depot files to workspace files. Note that a depot path is
still required, but files found in the path that match in
the client spec view will be laid out according to the client
spec.
Clone options
~~~~~~~~~~~~~

6
contrib/fast-import/git-p4
View file

@ -1951,7 +1951,10 @@ class P4Sync(Command, P4UserMap):
if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch):
system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
if self.useClientSpec or gitConfig("git-p4.useclientspec") == "true":
if not self.useClientSpec:
if gitConfig("git-p4.useclientspec", "--bool") == "true":
self.useClientSpec = True
if self.useClientSpec:
self.getClientSpec()
# TODO: should always look at previous commits,
@ -2380,6 +2383,7 @@ def main():
if not cmd.run(args):
parser.print_help()
sys.exit(2)
if __name__ == '__main__':

46
t/t9806-git-p4-options.sh
View file

@ -117,6 +117,52 @@ test_expect_success 'clone --keep-path' '
)
'
# clone --use-client-spec must still specify a depot path
# if given, it should rearrange files according to client spec
# when it has view lines that match the depot path
# XXX: should clone/sync just use the client spec exactly, rather
# than needing depot paths?
test_expect_success 'clone --use-client-spec' '
(
# big usage message
exec >/dev/null &&
test_must_fail "$GITP4" clone --dest="$git" --use-client-spec
) &&
cli2="$TRASH_DIRECTORY/cli2" &&
mkdir -p "$cli2" &&
test_when_finished "rmdir \"$cli2\"" &&
(
cd "$cli2" &&
p4 client -i <<-EOF
Client: client2
Description: client2
Root: $cli2
View: //depot/sub/... //client2/bus/...
EOF
) &&
P4CLIENT=client2 &&
test_when_finished cleanup_git &&
"$GITP4" clone --dest="$git" --use-client-spec //depot/... &&
(
cd "$git" &&
test_path_is_file bus/dir/f4 &&
test_path_is_file file1
) &&
cleanup_git &&
# same thing again, this time with variable instead of option
mkdir "$git" &&
(
cd "$git" &&
git init &&
git config git-p4.useClientSpec true &&
"$GITP4" sync //depot/... &&
git checkout -b master p4/master &&
test_path_is_file bus/dir/f4 &&
test_path_is_file file1
)
'
test_expect_success 'kill p4d' '
kill_p4d
'