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 02/22] git-p4: remove unneeded semicolons from statements
Date: Thu, 10 Feb 2022 16:46:07 +0000 [thread overview]
Message-ID: <20220210164627.279520-3-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220210164627.279520-1-jholdsworth@nvidia.com>
Python allows the usage of compound statements where multiple statements
are written on a single line separared by semicolons. It is also
possible to add a semicolon after a single statement, however this is
generally considered to be untidy, and is unnecessary.
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 265182b088..aabf657a57 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -813,7 +813,7 @@ def p4Cmd(cmd, *k, **kw):
result = {}
for entry in list:
result.update(entry)
- return result;
+ return result
def p4Where(depotPath):
@@ -914,8 +914,8 @@ def extractSettingsGitLog(log):
def gitBranchExists(branch):
proc = subprocess.Popen(["git", "rev-parse", branch],
- stderr=subprocess.PIPE, stdout=subprocess.PIPE);
- return proc.wait() == 0;
+ stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+ return proc.wait() == 0
def gitUpdateRef(ref, newvalue):
@@ -3530,8 +3530,8 @@ def gitCommitByP4Change(self, ref, change):
def importNewBranch(self, branch, maxChange):
# make fast-import flush all changes to disk and update the refs using the checkpoint
# command so that we can try to find the branch parent in the git history
- self.gitStream.write("checkpoint\n\n");
- self.gitStream.flush();
+ self.gitStream.write("checkpoint\n\n")
+ self.gitStream.flush()
branchPrefix = self.depotPaths[0] + branch + "/"
range = "@1,%s" % maxChange
#print "prefix" + branchPrefix
@@ -3607,12 +3607,12 @@ def importChanges(self, changes, origin_revision=0):
fullBranch = self.projectName + branch
if fullBranch not in self.p4BranchesInGit:
if not self.silent:
- print("\n Importing new branch %s" % fullBranch);
+ print("\n Importing new branch %s" % fullBranch)
if self.importNewBranch(branch, change - 1):
parent = ""
self.p4BranchesInGit.append(fullBranch)
if not self.silent:
- print("\n Resuming with change %s" % change);
+ print("\n Resuming with change %s" % change)
if self.verbose:
print("parent determined through known branches: %s" % parent)
@@ -3680,7 +3680,7 @@ def importHeadRevision(self, revision):
% info['data'])
if info['data'].find("must refer to client") >= 0:
sys.stderr.write("This particular p4 error is misleading.\n")
- sys.stderr.write("Perhaps the depot path was misspelled.\n");
+ sys.stderr.write("Perhaps the depot path was misspelled.\n")
sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
sys.exit(1)
if 'p4ExitCode' in info:
@@ -3789,7 +3789,7 @@ def openStreams(self):
self.importProcess = subprocess.Popen(["git", "fast-import"],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE);
+ stderr=subprocess.PIPE)
self.gitOutput = self.importProcess.stdout
self.gitStream = self.importProcess.stdin
self.gitError = self.importProcess.stderr
@@ -3975,7 +3975,7 @@ def run(self, args):
self.loadUserMapFromCache()
self.labels = {}
if self.detectLabels:
- self.getLabels();
+ self.getLabels()
if self.detectBranches:
## FIXME - what's a P4 projectName ?
@@ -4061,9 +4061,9 @@ def run(self, args):
def rebase(self):
if os.system("git update-index --refresh") != 0:
- die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");
+ die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.")
if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0:
- die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
+ die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.")
[upstream, settings] = findUpstreamBranchPoint()
if len(upstream) == 0:
@@ -4362,7 +4362,7 @@ def main():
formatter = HelpFormatter())
try:
- (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+ (cmd, args) = parser.parse_args(sys.argv[2:], cmd)
except:
parser.print_help()
raise
@@ -4378,7 +4378,7 @@ def main():
if os.path.exists(cmd.gitdir):
cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip()
if len(cdup) > 0:
- chdir(cdup);
+ chdir(cdup)
if not isValidGitDir(cmd.gitdir):
if isValidGitDir(cmd.gitdir + "/.git"):
--
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 ` Joel Holdsworth [this message]
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 ` [PATCH v4 20/22] git-p4: move inline comments to line above Joel Holdsworth
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-3-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).