git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 10/20] git-p4: place a single space after every comma

From
Joel Holdsworth <jholdsworth@nvidia.com>
Date
Jan 12, 2022, 13:46 UTC
Message-ID
<20220112134635.177877-11-jholdsworth@nvidia.com>
In-Reply-To
<20220112134635.177877-1-jholdsworth@nvidia.com>

This patch improves consistency across git-p4 by ensuring all command separated arguments to function invocations, tuples and lists are separated by commas with a single space following.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
 git-p4.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index c6201b8d23..0e54be57b3 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -99,7 +99,7 @@ def p4_build_cmd(cmd):
 
     user = gitConfig("git-p4.user")
     if len(user) > 0:
-        real_cmd += ["-u",user]
+        real_cmd += ["-u", user]
 
     password = gitConfig("git-p4.password")
     if len(password) > 0:
@@ -303,7 +303,7 @@ def run_hook_command(cmd, param):
     cli = [cmd] + param
     use_shell = False
     if platform.system() == 'Windows':
-        (root,ext) = os.path.splitext(cmd)
+        root, ext = os.path.splitext(cmd)
         if ext == "":
             exe_path = os.environ.get("EXEPATH")
             if exe_path is None:
@@ -1839,7 +1839,7 @@ def patchRCSKeywords(self, file, regexp):
 
         print("Patched up RCS keywords in %s" % file)
 
-    def p4UserForCommit(self,id):
+    def p4UserForCommit(self, id):
         """Return the tuple (perforce user,git email) for a given git commit
            id.
            """
@@ -1848,14 +1848,14 @@ def p4UserForCommit(self,id):
                               "--format=%ae", id])
         gitEmail = gitEmail.strip()
         if gitEmail not in self.emails:
-            return (None,gitEmail)
+            return (None, gitEmail)
         else:
-            return (self.emails[gitEmail],gitEmail)
+            return (self.emails[gitEmail], gitEmail)
 
-    def checkValidP4Users(self,commits):
+    def checkValidP4Users(self, commits):
         """Check if any git authors cannot be mapped to p4 users."""
         for id in commits:
-            (user,email) = self.p4UserForCommit(id)
+            user, email = self.p4UserForCommit(id)
             if not user:
                 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
                 if gitConfigBool("git-p4.allowMissingP4Users"):
@@ -3272,7 +3272,7 @@ def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
 
         gitStream.write("tagger %s\n" % tagger)
 
-        print("labelDetails=",labelDetails)
+        print("labelDetails=", labelDetails)
         if 'Description' in labelDetails:
             description = labelDetails['Description']
         else:
@@ -3478,7 +3478,7 @@ def importP4Labels(self, stream, p4Labels):
 
             if not m.match(name):
                 if verbose:
-                    print("label %s does not match regexp %s" % (name,validLabelRegexp))
+                    print("label %s does not match regexp %s" % (name, validLabelRegexp))
                 continue
 
             if name in ignoredP4Labels:
@@ -3801,7 +3801,7 @@ def importHeadRevision(self, revision):
         newestRevision = 0
 
         fileCnt = 0
-        fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
+        fileArgs = ["%s...%s" % (p, revision) for p in self.depotPaths]
 
         for info in p4CmdList(["files"] + fileArgs):
 
@@ -4304,7 +4304,7 @@ def renameBranch(self, branch_name):
         """Rename the existing branch to branch_name.N ."""
 
         found = True
-        for i in range(0,1000):
+        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
-- 
2.34.1
Previous: Joel HoldsworthNext: Eric Sunshine
Message 14 of 27 in “git-p4: Various code tidy-ups”
  1. 00/20 git-p4: Various code tidy-upsJoel Holdsworth, Jan 12, 2022
  2. 01/20 git-p4: add blank lines between functions and class definitionsJoel Holdsworth, Jan 12, 2022
  3. 02/20 git-p4: remove unneeded semicolons from statementsJoel Holdsworth, Jan 12, 2022
  4. 03/20 git-p4: indent with 4-spacesJoel Holdsworth, Jan 12, 2022
  5. 04/20 git-p4: improve consistency of docstring formattingJoel Holdsworth, Jan 12, 2022
  6. Eric SunshineJan 12, 2022
  7. 05/20 git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth, Jan 12, 2022
  8. Eric SunshineJan 12, 2022
  9. 06/20 git-p4: remove commented codeJoel Holdsworth, Jan 12, 2022
  10. Eric SunshineJan 12, 2022
  11. 09/20 git-p4: remove spaces around default argumentsJoel Holdsworth, Jan 12, 2022
  12. 07/20 git-p4: sort and de-duplcate pylint disable listJoel Holdsworth, Jan 12, 2022
  13. 08/20 git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth, Jan 12, 2022
  14. 10/20 git-p4: place a single space after every commaJoel Holdsworth, Jan 12, 2022
  15. Eric SunshineJan 12, 2022
  16. 16/20 git-p4: tidied visual indented lines of conditionalsJoel Holdsworth, Jan 12, 2022
  17. Eric SunshineJan 12, 2022
  18. 11/20 git-p4: remove extraneous spaces before function argumentsJoel Holdsworth, Jan 12, 2022
  19. 12/20 git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth, Jan 12, 2022
  20. 13/20 git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth, Jan 12, 2022
  21. 14/20 git-p4: ensure every comment has a single #Joel Holdsworth, Jan 12, 2022
  22. 17/20 git-p4: compare to singletons with "is" and "is not"Joel Holdsworth, Jan 12, 2022
  23. Eric SunshineJan 12, 2022
  24. 15/20 git-p4: ensure there is a single space around all operatorsJoel Holdsworth, Jan 12, 2022
  25. 18/20 git-p4: only seperate code blocks by a single empty lineJoel Holdsworth, Jan 12, 2022
  26. 19/20 git-p4: move inline comments to line aboveJoel Holdsworth, Jan 12, 2022
  27. 20/20 git-p4: seperate multiple statements onto seperate linesJoel Holdsworth, Jan 12, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.