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

Commit Message

Joel Holdsworth Jan. 12, 2022, 1:46 p.m. UTC

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 <[e-mail]>
---
 git-p4.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Comments

Eric Sunshine Jan. 12, 2022, 7:41 p.m. UTC | #1

On Wed, Jan 12, 2022 at 8:47 AM Joel Holdsworth <[e-mail]> wrote:
> 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 <[e-mail]>
> ---
> diff --git a/git-p4.py b/git-p4.py
> @@ -303,7 +303,7 @@ def run_hook_command(cmd, param):
> -        (root,ext) = os.path.splitext(cmd)
> +        root, ext = os.path.splitext(cmd)

Someone who doesn't code in Python regularly might wonder if the
removal of parentheses on the left side of the assignment brings some
sort of semantic change with it. Perhaps the removal deserves mention
in the commit message?

Not necessarily worth a reroll.

Patch

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