mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-p4: place a single space after every comma

Browse Source 
This patch improves consistency across git-p4 by ensuring all command
separated arguments to function invocations, tuples and lists are
separated by commas with a single space following.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Joel Holdsworth 2022-04-01 15:24:53 +01:00 committed by Junio C Hamano
parent 0874bb016a
commit 12a77f5b7e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-p4.py
View File

@ -99,7 +99,7 @@ def p4_build_cmd(cmd):
user = gitConfig("git-p4.user") user = gitConfig("git-p4.user")
if len(user) > 0: if len(user) > 0:
real_cmd += ["-u",user] real_cmd += ["-u", user]
password = gitConfig("git-p4.password") password = gitConfig("git-p4.password")
if len(password) > 0: if len(password) > 0:
@ -1766,7 +1766,7 @@ class P4Submit(Command, P4UserMap):
print("Patched up RCS keywords in %s" % file) print("Patched up RCS keywords in %s" % file)
def p4UserForCommit(self,id): def p4UserForCommit(self, id):
"""Return the tuple (perforce user,git email) for a given git commit """Return the tuple (perforce user,git email) for a given git commit
id. id.
""" """
@ -1775,11 +1775,11 @@ class P4Submit(Command, P4UserMap):
"--format=%ae", id]) "--format=%ae", id])
gitEmail = gitEmail.strip() gitEmail = gitEmail.strip()
if gitEmail not in self.emails: if gitEmail not in self.emails:
return (None,gitEmail) return (None, gitEmail)
else: else:
return (self.emails[gitEmail],gitEmail) return (self.emails[gitEmail], gitEmail)
def checkValidP4Users(self,commits): def checkValidP4Users(self, commits):
"""Check if any git authors cannot be mapped to p4 users.""" """Check if any git authors cannot be mapped to p4 users."""
for id in commits: for id in commits:
user, email = self.p4UserForCommit(id) user, email = self.p4UserForCommit(id)
@ -3203,7 +3203,7 @@ class P4Sync(Command, P4UserMap):
gitStream.write("tagger %s\n" % tagger) gitStream.write("tagger %s\n" % tagger)
print("labelDetails=",labelDetails) print("labelDetails=", labelDetails)
if 'Description' in labelDetails: if 'Description' in labelDetails:
description = labelDetails['Description'] description = labelDetails['Description']
else: else:
@ -3409,7 +3409,7 @@ class P4Sync(Command, P4UserMap):
if not m.match(name): if not m.match(name):
if verbose: if verbose:
print("label %s does not match regexp %s" % (name,validLabelRegexp)) print("label %s does not match regexp %s" % (name, validLabelRegexp))
continue continue
if name in ignoredP4Labels: if name in ignoredP4Labels:
@ -3730,7 +3730,7 @@ class P4Sync(Command, P4UserMap):
newestRevision = 0 newestRevision = 0
fileCnt = 0 fileCnt = 0
fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths] fileArgs = ["%s...%s" % (p, revision) for p in self.depotPaths]
for info in p4CmdList(["files"] + fileArgs): for info in p4CmdList(["files"] + fileArgs):
@ -4235,7 +4235,7 @@ class P4Unshelve(Command):
"""Rename the existing branch to branch_name.N .""" """Rename the existing branch to branch_name.N ."""
found = True found = True
for i in range(0,1000): for i in range(0, 1000):
backup_branch_name = "{0}.{1}".format(branch_name, i) backup_branch_name = "{0}.{1}".format(branch_name, i)
if not gitBranchExists(backup_branch_name): if not gitBranchExists(backup_branch_name):
gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup