mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: support single file p4 client view maps

Browse Source 
Perforce client views can map individual files,
mapping one //depot file path to one //client file path.
These mappings contain no meta/masking characters.
This patch add support for these file maps to
the currently supported '...' view mappings.

[pw: one test now suceeds]

Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Gary Gibbons
2012-01-02 18:05:52 -05:00
committed by Junio C Hamano
parent df5ed9077f
commit e3e68643b5
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/fast-import/git-p4
View File

@ -1217,6 +1217,7 @@ class P4Sync(Command, P4UserMap):
self.cloneExclude = [] self.cloneExclude = []
self.useClientSpec = False self.useClientSpec = False
self.clientSpecDirs = [] self.clientSpecDirs = []
self.haveSingleFileClientViews = False
if gitConfig("git-p4.syncFromOrigin") == "false": if gitConfig("git-p4.syncFromOrigin") == "false":
self.syncWithOrigin = False self.syncWithOrigin = False
@ -1274,6 +1275,16 @@ class P4Sync(Command, P4UserMap):
# will end up putting all foo/branch files into # will end up putting all foo/branch files into
# branch/foo/ # branch/foo/
for val in self.clientSpecDirs: for val in self.clientSpecDirs:
if self.haveSingleFileClientViews and len(path) == abs(val[1][0]) and path == val[0]:
# since 'path' is a depot file path, if it matches the LeftMap,
# then the View is a single file mapping, so use the entire rightMap
# first two tests above avoid the last == test for common cases
path = val[1][1]
# now strip out the client (//client/...)
path = re.sub("^(//[^/]+/)", '', path)
# the rest is local client path
return path
if path.startswith(val[0]): if path.startswith(val[0]):
# replace the depot path with the client path # replace the depot path with the client path
path = path.replace(val[0], val[1][1]) path = path.replace(val[0], val[1][1])
@ -1905,19 +1916,19 @@ class P4Sync(Command, P4UserMap):
# save the "client view"; i.e the RHS of the view # save the "client view"; i.e the RHS of the view
# line that tells the client where to put the # line that tells the client where to put the
# files for this view. # files for this view.
cv = v[index+3:].strip() # +3 to remove previous '...'
# if the client view doesn't end with a # check for individual file mappings - those which have no '...'
# ... wildcard, then we're going to mess up the if index < 0 :
# output directory, so fail gracefully. v,cv = v.strip().split()
if not cv.endswith('...'): v = v[start:]
print 'Sorry, client view in "%s" needs to end with wildcard' % (k) self.haveSingleFileClientViews = True
sys.exit(1) else:
cv=cv[:-3] cv = v[index+3:].strip() # +3 to remove previous '...'
cv=cv[:-3]
v = v[start:index]
# now save the view; +index means included, -index # now save the view; +index means included, -index
# means it should be filtered out. # means it should be filtered out.
v = v[start:index]
if v.startswith("-"): if v.startswith("-"):
v = v[1:] v = v[1:]
include = -len(v) include = -len(v)

2
t/t9809-git-p4-client-view.sh
View File

@ -191,7 +191,7 @@ test_expect_success 'exclusion wildcard, client rhs different (normal)' '
git_verify $files git_verify $files
' '
test_expect_failure 'exclusion single file' ' test_expect_success 'exclusion single file' '
client_view "//depot/... //client/..." \ client_view "//depot/... //client/..." \
"-//depot/dir2/file22 //client/file22" && "-//depot/dir2/file22 //client/file22" &&
files="dir1/file11 dir1/file12 dir2/file21" && files="dir1/file11 dir1/file12 dir2/file21" &&