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 <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-p4.py b/git-p4.py
index 6d0711559a8918e79620d72e4150acb608745bfd..e20ff5dff14f6fe88e7fb3cd0fa844b94582dd03 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1819,15 +1819,17 @@ def extractFilesFromCommit(self, commit):
 
     def stripRepoPath(self, path, prefixes):
         if self.useClientSpec:
 
     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):
         return path
 
     def splitFilesIntoBranches(self, commit):


@@ -1849,7 +1851,6 @@ def splitFilesIntoBranches(self, commit):
             fnum = fnum + 1
 
             relPath = self.stripRepoPath(path, self.depotPaths)
             fnum = fnum + 1
 
             relPath = self.stripRepoPath(path, self.depotPaths)

-            relPath = wildcard_decode(relPath)

 
             for branch in self.knownBranches.keys():
 
 
             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)
 
     def streamOneP4File(self, file, contents):
         relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)

-        relPath = wildcard_decode(relPath)

         if verbose:
             sys.stderr.write("%s\n" % 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)
 
     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)
         if verbose:
             sys.stderr.write("delete %s\n" % relPath)
         self.gitStream.write("D %s\n" % relPath)