From: Vitor Antunes <vitor.hda@gmail.com>
To: git@vger.kernel.org
Cc: Luke Diamand <luke@diamand.org>,
Junio C Hamano <gitster@pobox.com>,
Vitor Antunes <vitor.hda@gmail.com>
Subject: [PATCH] git-p4: Improve client path detection when branches are used
Date: Sun, 19 Apr 2015 00:24:05 +0100 [thread overview]
Message-ID: <1429399445-11024-1-git-send-email-vitor.hda@gmail.com> (raw)
In-Reply-To: <xmqqsic44rw5.fsf@gitster.dls.corp.google.com>
This patch makes the client path detection more robust by limiting the valid
results from p4 where. The test case is also made more complex, to guarantee
that such client views are supported.
Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
---
git-p4.py | 4 +++-
t/t9801-git-p4-branch.sh | 12 ++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 262a95b..28d0d90 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -507,7 +507,9 @@ def p4Where(depotPath):
output = None
for entry in outputList:
if "depotFile" in entry:
- if entry["depotFile"].find(depotPath) >= 0:
+ # Search for the base client side depot path, as long as it starts with the branch's P4 path.
+ # The base path always ends with "/...".
+ if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...":
output = entry
break
elif "data" in entry:
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 4fe4e18..0aafd03 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -512,23 +512,28 @@ test_expect_success 'restart 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 remove the "base" folder from the workspace
+# 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 &&
- p4 add file1 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" &&
@@ -561,16 +566,19 @@ test_expect_success 'git p4 clone simple branches with base folder on server sid
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 &&
--
1.7.10.4
next prev parent reply other threads:[~2015-04-18 23:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-28 12:28 [PATCH 0/2] git-p4: Improve client path detection Vitor Antunes
2015-03-28 12:28 ` [PATCH 1/2] git-p4: Check branch detection and client view together Vitor Antunes
2015-03-28 12:28 ` [PATCH 2/2] git-p4: Improve client path detection when branches are used Vitor Antunes
2015-03-29 23:31 ` [PATCH] t9814: Guarantee only one source exists in git-p4 copy tests Vitor Antunes
2015-03-30 3:03 ` Junio C Hamano
2015-03-31 13:26 ` Luke Diamand
2015-03-31 23:29 ` [PATCH V2] " Vitor Antunes
2015-04-04 8:31 ` [PATCH] " Luke Diamand
2015-04-04 19:41 ` Junio C Hamano
2015-04-05 23:08 ` [PATCH V3] " Vitor Antunes
2015-04-05 19:27 ` [PATCH 0/2] git-p4: Improve client path detection Luke Diamand
2015-04-05 22:57 ` Vitor Antunes
2015-04-13 3:40 ` Junio C Hamano
2015-04-18 22:40 ` Vitor Antunes
2015-04-18 23:24 ` Vitor Antunes [this message]
2015-04-19 0:58 ` [PATCH] git-p4: Improve client path detection when branches are used Junio C Hamano
2015-04-19 10:59 ` Vitor Antunes
2015-04-20 5:32 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429399445-11024-1-git-send-email-vitor.hda@gmail.com \
--to=vitor.hda@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=luke@diamand.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).