From 0d1696ef47a61bba1088b0e5cd58a8bc45d936fb Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Sat, 11 Aug 2012 12:55:03 -0400 Subject: [PATCH] git p4: do wildcard decoding in stripRepoPath Instead of having to remember to do it after each call to stripRepoPath, make it part of that function. Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano --- git-p4.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/git-p4.py b/git-p4.py index 6d0711559a..e20ff5dff1 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1819,15 +1819,17 @@ def extractFilesFromCommit(self, commit): def stripRepoPath(self, path, prefixes): if self.useClientSpec: - return self.clientSpecDirs.map_in_client(path) + path = self.clientSpecDirs.map_in_client(path) - if self.keepRepoPath: - prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])] + else: + if self.keepRepoPath: + prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])] - for p in prefixes: - if p4PathStartsWith(path, p): - path = path[len(p):] + for p in prefixes: + if p4PathStartsWith(path, p): + path = path[len(p):] + path = wildcard_decode(path) return path def splitFilesIntoBranches(self, commit): @@ -1849,7 +1851,6 @@ def splitFilesIntoBranches(self, commit): fnum = fnum + 1 relPath = self.stripRepoPath(path, self.depotPaths) - relPath = wildcard_decode(relPath) for branch in self.knownBranches.keys(): @@ -1867,7 +1868,6 @@ def splitFilesIntoBranches(self, commit): def streamOneP4File(self, file, contents): relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes) - relPath = wildcard_decode(relPath) if verbose: sys.stderr.write("%s\n" % relPath) @@ -1936,7 +1936,6 @@ def streamOneP4File(self, file, contents): def streamOneP4Deletion(self, file): relPath = self.stripRepoPath(file['path'], self.branchPrefixes) - relPath = wildcard_decode(relPath) if verbose: sys.stderr.write("delete %s\n" % relPath) self.gitStream.write("D %s\n" % relPath)