mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
git-p4: remove padding from lists, tuples and function arguments
PEP8 discourages use of extraneous padding inside any parenthesis, brackets or braces in the "Pet Peeves" section: https://www.python.org/dev/peps/pep-0008/#pet-peeves This patch removes all cases of these. Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
794bb28d2a
commit
84af8b8544
36
git-p4.py
36
git-p4.py
@@ -952,10 +952,10 @@ _gitConfig = {}
|
||||
|
||||
def gitConfig(key, typeSpecifier=None):
|
||||
if key not in _gitConfig:
|
||||
cmd = [ "git", "config" ]
|
||||
cmd = ["git", "config"]
|
||||
if typeSpecifier:
|
||||
cmd += [ typeSpecifier ]
|
||||
cmd += [ key ]
|
||||
cmd += [typeSpecifier]
|
||||
cmd += [key]
|
||||
s = read_pipe(cmd, ignore_error=True)
|
||||
_gitConfig[key] = s.strip()
|
||||
return _gitConfig[key]
|
||||
@@ -974,7 +974,7 @@ def gitConfigBool(key):
|
||||
|
||||
def gitConfigInt(key):
|
||||
if key not in _gitConfig:
|
||||
cmd = [ "git", "config", "--int", key ]
|
||||
cmd = ["git", "config", "--int", key]
|
||||
s = read_pipe(cmd, ignore_error=True)
|
||||
v = s.strip()
|
||||
try:
|
||||
@@ -1030,7 +1030,7 @@ def p4BranchesInGit(branchesAreInRemotes=True):
|
||||
def branch_exists(branch):
|
||||
"""Make sure that the given ref name really exists."""
|
||||
|
||||
cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
|
||||
cmd = ["git", "rev-parse", "--symbolic", "--verify", branch]
|
||||
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
out, _ = p.communicate()
|
||||
out = decode_text_stream(out)
|
||||
@@ -1246,7 +1246,7 @@ def getClientSpec():
|
||||
client_name = entry["Client"]
|
||||
|
||||
# just the keys that start with "View"
|
||||
view_keys = [ k for k in entry.keys() if k.startswith("View") ]
|
||||
view_keys = [k for k in entry.keys() if k.startswith("View")]
|
||||
|
||||
# hold this new View
|
||||
view = View(client_name)
|
||||
@@ -1512,8 +1512,8 @@ class GitLFS(LargeFileSystem):
|
||||
|
||||
|
||||
class Command:
|
||||
delete_actions = ( "delete", "move/delete", "purge" )
|
||||
add_actions = ( "add", "branch", "move/add" )
|
||||
delete_actions = ("delete", "move/delete", "purge")
|
||||
add_actions = ("add", "branch", "move/add")
|
||||
|
||||
def __init__(self):
|
||||
self.usage = "usage: %prog [options]"
|
||||
@@ -2521,7 +2521,7 @@ class P4Submit(Command, P4UserMap):
|
||||
sys.exit(1)
|
||||
except Exception as e:
|
||||
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
|
||||
"with the error '{0}'".format(e.message) )
|
||||
"with the error '{0}'".format(e.message))
|
||||
sys.exit(1)
|
||||
|
||||
#
|
||||
@@ -2726,7 +2726,7 @@ class View(object):
|
||||
if depot_path in self.client_spec_path_cache:
|
||||
return self.client_spec_path_cache[depot_path]
|
||||
|
||||
die( "Error: %s is not found in client spec path" % depot_path )
|
||||
die("Error: %s is not found in client spec path" % depot_path)
|
||||
return ""
|
||||
|
||||
|
||||
@@ -3024,7 +3024,7 @@ class P4Sync(Command, P4UserMap):
|
||||
else:
|
||||
if p4_version_string().find('/NT') >= 0:
|
||||
text = text.replace(b'\r\n', b'\n')
|
||||
contents = [ text ]
|
||||
contents = [text]
|
||||
|
||||
if type_base == "apple":
|
||||
# Apple filetype files will be streamed as a concatenation of
|
||||
@@ -3646,7 +3646,7 @@ class P4Sync(Command, P4UserMap):
|
||||
for branch in branches.keys():
|
||||
## HACK --hwn
|
||||
branchPrefix = self.depotPaths[0] + branch + "/"
|
||||
self.branchPrefixes = [ branchPrefix ]
|
||||
self.branchPrefixes = [branchPrefix]
|
||||
|
||||
parent = ""
|
||||
|
||||
@@ -3754,7 +3754,7 @@ class P4Sync(Command, P4UserMap):
|
||||
if info["action"] in self.delete_actions:
|
||||
continue
|
||||
|
||||
for prop in ["depotFile", "rev", "action", "type" ]:
|
||||
for prop in ["depotFile", "rev", "action", "type"]:
|
||||
details["%s%s" % (prop, fileCnt)] = info[prop]
|
||||
|
||||
fileCnt = fileCnt + 1
|
||||
@@ -3908,7 +3908,7 @@ class P4Sync(Command, P4UserMap):
|
||||
if branch_arg_given:
|
||||
short = self.branch.split("/")[-1]
|
||||
if short in branches:
|
||||
self.p4BranchesInGit = [ short ]
|
||||
self.p4BranchesInGit = [short]
|
||||
else:
|
||||
self.p4BranchesInGit = branches.keys()
|
||||
|
||||
@@ -4190,7 +4190,7 @@ class P4Clone(P4Sync):
|
||||
os.makedirs(self.cloneDestination)
|
||||
chdir(self.cloneDestination)
|
||||
|
||||
init_cmd = [ "git", "init" ]
|
||||
init_cmd = ["git", "init"]
|
||||
if self.cloneBare:
|
||||
init_cmd.append("--bare")
|
||||
retcode = subprocess.call(init_cmd)
|
||||
@@ -4202,9 +4202,9 @@ class P4Clone(P4Sync):
|
||||
|
||||
# create a master branch and check out a work tree
|
||||
if gitBranchExists(self.branch):
|
||||
system([ "git", "branch", currentGitBranch(), self.branch ])
|
||||
system(["git", "branch", currentGitBranch(), self.branch])
|
||||
if not self.cloneBare:
|
||||
system([ "git", "checkout", "-f" ])
|
||||
system(["git", "checkout", "-f"])
|
||||
else:
|
||||
print('Not checking out any branch, use ' \
|
||||
'"git checkout -q -b master <branch>"')
|
||||
@@ -4335,7 +4335,7 @@ class P4Unshelve(Command):
|
||||
class P4Branches(Command):
|
||||
def __init__(self):
|
||||
Command.__init__(self)
|
||||
self.options = [ ]
|
||||
self.options = []
|
||||
self.description = ("Shows the git branches that hold imports and their "
|
||||
+ "corresponding perforce depot paths")
|
||||
self.verbose = False
|
||||
|
||||
Reference in New Issue
Block a user