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>
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 v4 20/22] git-p4: move inline comments to line above
Date: Thu, 10 Feb 2022 16:46:25 +0000 [thread overview]
Message-ID: <20220210164627.279520-21-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220210164627.279520-1-jholdsworth@nvidia.com>
PEP8 recommends that all inline comments should be separated from code
by two spaces, in the "Inline Comments" section:
https://www.python.org/dev/peps/pep-0008/#inline-comments
However, because all instances of these inline comments extended to an
excessive line length, they have been moved onto a seprate line.
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index c003b6246d..524a7a5c99 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1979,7 +1979,9 @@ def get_diff_description(self, editedFiles, filesToAdd, symlinks):
for line in f.readlines():
newdiff += "+" + line
except UnicodeDecodeError:
- pass # Found non-text data and skip, since diff description should only include text
+ # Found non-text data and skip, since diff description
+ # should only include text
+ pass
f.close()
return (diff + newdiff).replace('\r\n', '\n')
@@ -2975,7 +2977,8 @@ def streamOneP4File(self, file, contents):
if 'fileSize' in self.stream_file:
size = int(self.stream_file['fileSize'])
else:
- size = 0 # deleted files don't get a fileSize apparently
+ # Deleted files don't get a fileSize apparently
+ size = 0
sys.stdout.write('\r%s --> %s (%s)\n' % (
file_path, relPath, format_size_human_readable(size)))
sys.stdout.flush()
@@ -4233,7 +4236,8 @@ def renameBranch(self, branch_name):
for i in range(0, 1000):
backup_branch_name = "{0}.{1}".format(branch_name, i)
if not gitBranchExists(backup_branch_name):
- gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup
+ # Copy ref to backup
+ gitUpdateRef(backup_branch_name, branch_name)
gitDeleteRef(branch_name)
found = True
print("renamed old unshelve branch to {0}".format(backup_branch_name))
--
2.35.GIT
next prev parent reply other threads:[~2022-02-10 16:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 16:46 [PATCH v4 00/22] git-p4: Various code tidy-ups Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 01/22] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 02/22] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 03/22] git-p4: indent with 4-spaces Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 04/22] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 05/22] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 06/22] git-p4: remove commented code Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 07/22] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 08/22] git-p4: remove padding from lists, tuples and function arguments Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 09/22] git-p4: remove spaces around default arguments Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 10/22] git-p4: removed brackets when assigning multiple return values Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 11/22] git-p4: place a single space after every comma Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 12/22] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 13/22] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 14/22] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 15/22] git-p4: ensure every comment has a single # Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 16/22] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 17/22] git-p4: normalize indentation of lines in conditionals Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 18/22] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 19/22] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-02-10 16:46 ` Joel Holdsworth [this message]
2022-02-10 16:46 ` [PATCH v4 21/22] git-p4: seperate multiple statements onto seperate lines Joel Holdsworth
2022-02-10 16:46 ` [PATCH v4 22/22] git-p4: sort imports Joel Holdsworth
2022-04-02 12:14 ` [PATCH v4 00/22] git-p4: Various code tidy-ups Tao Klerks
2022-04-02 17:45 ` Tao Klerks
2022-04-04 14:46 ` Joel Holdsworth
2022-04-05 4:27 ` Tao Klerks
2022-04-05 11:29 ` Tao Klerks
2022-04-05 12:04 ` Joel Holdsworth
2022-04-05 17:16 ` Tao Klerks
2022-04-11 9:54 ` Tao Klerks
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220210164627.279520-21-jholdsworth@nvidia.com \
--to=jholdsworth@nvidia.com \
--cc=andrew@adoakley.name \
--cc=dendy.ua@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joachim.kuebart@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
--cc=seraphire@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tzadik.vanderhoof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).