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 17/22] git-p4: normalize indentation of lines in conditionals
Date: Fri, 1 Apr 2022 15:24:59 +0100 [thread overview]
Message-ID: <20220401142504.58995-18-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220401142504.58995-1-jholdsworth@nvidia.com>
PEP8 recommends that when wrapping the arguments of conditional
statements, an extra level of indentation should be added to distinguish
arguments from the body of the statement.
This guideline is described here:
https://www.python.org/dev/peps/pep-0008/#indentation
This patch either adds the indentation, or removes unnecessary wrapping.
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia•com>
---
git-p4.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 97c2f82ee8..a25adc8bae 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1085,8 +1085,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix="refs/remotes/p4/", silent=T
originHead = line
original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
- if ('depot-paths' not in original
- or 'change' not in original):
+ if 'depot-paths' not in original or 'change' not in original:
continue
update = False
@@ -2098,8 +2097,8 @@ def applyCommit(self, id):
if regexp:
# this file is a possibility...look for RCS keywords.
for line in read_pipe_lines(
- ["git", "diff", "%s^..%s" % (id, id), file],
- raw=True):
+ ["git", "diff", "%s^..%s" % (id, id), file],
+ raw=True):
if regexp.search(line):
if verbose:
print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
@@ -3112,9 +3111,9 @@ def streamP4FilesCb(self, marshalled):
self.stream_file[k] = marshalled[k]
if (verbose and
- 'streamContentSize' in self.stream_file and
- 'fileSize' in self.stream_file and
- 'depotFile' in self.stream_file):
+ 'streamContentSize' in self.stream_file and
+ 'fileSize' in self.stream_file and
+ 'depotFile' in self.stream_file):
size = int(self.stream_file["fileSize"])
if size > 0:
progress = 100*self.stream_file['streamContentSize']/size
@@ -3930,8 +3929,7 @@ def run(self, args):
settings = extractSettingsGitLog(logMsg)
self.readOptions(settings)
- if ('depot-paths' in settings
- and 'change' in settings):
+ if 'depot-paths' in settings and 'change' in settings:
change = int(settings['change']) + 1
p4Change = max(p4Change, change)
--
2.35.GIT
next prev parent reply other threads:[~2022-04-01 14:27 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 ` [PATCH v5 03/22] git-p4: indent with 4-spaces Joel Holdsworth
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 ` Joel Holdsworth [this message]
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-18-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