mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: indent with 4-spaces

Browse Source 
PEP8 recommends that all code should be indented in 4-space units. This
guideline is described here:

https://www.python.org/dev/peps/pep-0008/#indentation

Previously git-p4 had multiple cases where code was indented with a
non-multiple of 4-spaces. This patch fixes each of these.

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:45 +01:00
committed by Junio C Hamano
parent 990547aa2b
commit 812ee74ea0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
git-p4.py
View File

@ -877,12 +877,12 @@ def extractLogMessageFromGitCommit(commit):
## fixme: title is first line of commit, not 1st paragraph. ## fixme: title is first line of commit, not 1st paragraph.
foundTitle = False foundTitle = False
for log in read_pipe_lines(["git", "cat-file", "commit", commit]): for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
if not foundTitle: if not foundTitle:
if len(log) == 1: if len(log) == 1:
foundTitle = True foundTitle = True
continue continue
logMessage += log logMessage += log
return logMessage return logMessage
@ -1094,7 +1094,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
def originP4BranchesExist(): def originP4BranchesExist():
return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master") return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
def p4ParseNumericChangeRange(parts): def p4ParseNumericChangeRange(parts):
@ -2116,7 +2116,7 @@ class P4Submit(Command, P4UserMap):
submitTemplate = self.prepareLogMessage(template, logMessage, jobs) submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
if self.preserveUser: if self.preserveUser:
submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
if self.checkAuthorship and not self.p4UserIsMe(p4User): if self.checkAuthorship and not self.p4UserIsMe(p4User):
submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
@ -2565,7 +2565,7 @@ class P4Submit(Command, P4UserMap):
# exit with error unless everything applied perfectly # exit with error unless everything applied perfectly
if len(commits) != len(applied): if len(commits) != len(applied):
sys.exit(1) sys.exit(1)
return True return True
@ -3401,7 +3401,7 @@ class P4Sync(Command, P4UserMap):
p = p[:-1] p = p[:-1]
p = p[p.strip().rfind("/") + 1:] p = p[p.strip().rfind("/") + 1:]
if not p.endswith("/"): if not p.endswith("/"):
p += "/" p += "/"
return p return p
def getBranchMapping(self): def getBranchMapping(self):