undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: Fix regression in p4Where method.

Browse Source 
Unfortunately, I introduced a bug in commit 7f705dc36 (git-p4: Fix bug in
p4Where method). This happens because sometimes the result from
"p4 where <somepath>" doesn't contain a "depotFile" key, but instead a
"data" key that needs further parsing. This commit should ensure that both
of these cases are checked.

Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tor Arvid Lund 2008-12-09 16:41:50 +01:00 committed by Junio C Hamano
parent 29b802aae6
commit 75bc9573b0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,9 +249,16 @@ def p4Where(depotPath):
outputList = p4CmdList("where %s" % depotPath) outputList = p4CmdList("where %s" % depotPath)
output = None output = None
for entry in outputList: for entry in outputList:
if "depotFile" in entry:
if entry["depotFile"] == depotPath: if entry["depotFile"] == depotPath:
output = entry output = entry
break break
elif "data" in entry:
data = entry.get("data")
space = data.find(" ")
if data[:space] == depotPath:
output = entry
break
if output == None: if output == None:
return "" return ""
if output["code"] == "error": if output["code"] == "error":