From: Joel Holdsworth <jholdsworth@nvidia•com>
To: git@vger•kernel.org, "Luke Diamand" <luke@diamand•org>,
"Junio C Hamano" <gitster@pobox•com>,
"Eric Sunshine" <sunshine@sunshineco•com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
Cc: Tzadik Vanderhoof <tzadik.vanderhoof@gmail•com>,
Dorgon Chang <dorgonman@hotmail•com>,
Joachim Kuebart <joachim.kuebart@gmail•com>,
Daniel Levin <dendy.ua@gmail•com>,
Johannes Schindelin <johannes.schindelin@gmx•de>,
Ben Keene <seraphire@gmail•com>,
Andrew Oakley <andrew@adoakley•name>,
Joel Holdsworth <jholdsworth@nvidia•com>
Subject: [PATCH v5 03/22] git-p4: indent with 4-spaces
Date: Fri, 1 Apr 2022 15:24:45 +0100 [thread overview]
Message-ID: <20220401142504.58995-4-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220401142504.58995-1-jholdsworth@nvidia.com>
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>
---
git-p4.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index aabf657a57..a9be9ab13c 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -877,12 +877,12 @@ def extractLogMessageFromGitCommit(commit):
## fixme: title is first line of commit, not 1st paragraph.
foundTitle = False
for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
- if not foundTitle:
- if len(log) == 1:
- foundTitle = True
- continue
+ if not foundTitle:
+ if len(log) == 1:
+ foundTitle = True
+ continue
- logMessage += log
+ logMessage += log
return logMessage
@@ -1094,7 +1094,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
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):
@@ -2116,7 +2116,7 @@ def applyCommit(self, id):
submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
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):
submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
@@ -2565,7 +2565,7 @@ def run(self, args):
# exit with error unless everything applied perfectly
if len(commits) != len(applied):
- sys.exit(1)
+ sys.exit(1)
return True
@@ -3401,7 +3401,7 @@ def guessProjectName(self):
p = p[:-1]
p = p[p.strip().rfind("/") + 1:]
if not p.endswith("/"):
- p += "/"
+ p += "/"
return p
def getBranchMapping(self):
--
2.35.GIT
next prev parent reply other threads:[~2022-04-01 15:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-01 14:24 [PATCH v5 00/22] git-p4: Various code tidy-ups Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 01/22] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 02/22] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-04-01 14:24 ` Joel Holdsworth [this message]
2022-04-01 14:24 ` [PATCH v5 04/22] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 05/22] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 06/22] git-p4: remove commented code Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 07/22] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 08/22] git-p4: remove padding from lists, tuples and function arguments Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 09/22] git-p4: remove spaces around default arguments Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 10/22] git-p4: removed brackets when assigning multiple return values Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 11/22] git-p4: place a single space after every comma Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 12/22] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 13/22] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 14/22] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 15/22] git-p4: ensure every comment has a single # Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 16/22] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-04-01 14:24 ` [PATCH v5 17/22] git-p4: normalize indentation of lines in conditionals Joel Holdsworth
2022-04-01 14:25 ` [PATCH v5 18/22] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-04-01 14:25 ` [PATCH v5 19/22] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-04-01 14:25 ` [PATCH v5 20/22] git-p4: move inline comments to line above Joel Holdsworth
2022-04-01 14:25 ` [PATCH v5 21/22] git-p4: seperate multiple statements onto seperate lines Joel Holdsworth
2022-04-01 14:25 ` [PATCH v5 22/22] git-p4: sort imports Joel Holdsworth
2022-04-10 7:32 ` [PATCH v5 00/22] git-p4: Various code tidy-ups Tao Klerks
2022-04-11 19:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220401142504.58995-4-jholdsworth@nvidia.com \
--to=jholdsworth@nvidia$(echo .)com \
--cc=andrew@adoakley$(echo .)name \
--cc=avarab@gmail$(echo .)com \
--cc=dendy.ua@gmail$(echo .)com \
--cc=dorgonman@hotmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=joachim.kuebart@gmail$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=luke@diamand$(echo .)org \
--cc=seraphire@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tzadik.vanderhoof@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox