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

Detect exec bit in more cases.

Browse Source 
git-p4 was missing the execute bit setting if the file had other attribute
bits set.

Acked-By: Simon Hausmann <simon@lst.de>
This commit is contained in:
David Brown 2007-09-19 13:12:48 -07:00 committed by Junio C Hamano
parent 9c2d28c74e
commit b9fc6ea9ef
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,14 @@ def system(cmd):
if os.system(cmd) != 0: if os.system(cmd) != 0:
die("command failed: %s" % cmd) die("command failed: %s" % cmd)
def isP4Exec(kind):
"""Determine if a Perforce 'kind' should have execute permission
'p4 help filetypes' gives a list of the types. If it starts with 'x',
or x follows one of a few letters. Otherwise, if there is an 'x' after
a plus sign, it is also executable"""
return (re.search(r"(^[cku]?x)|\+.*x", kind) != None)
def p4CmdList(cmd, stdin=None, stdin_mode='w+b'): def p4CmdList(cmd, stdin=None, stdin_mode='w+b'):
cmd = "p4 -G %s" % cmd cmd = "p4 -G %s" % cmd
if verbose: if verbose:
@ -916,7 +924,7 @@ class P4Sync(Command):
data = file['data'] data = file['data']
mode = "644" mode = "644"
if file["type"].startswith("x"): if isP4Exec(file["type"]):
mode = "755" mode = "755"
elif file["type"] == "symlink": elif file["type"] == "symlink":
mode = "120000" mode = "120000"