From: Joel Holdsworth <jholdsworth@nvidia.com>
Date: Fri, 1 Apr 2022 14:25:03 +0000 (+0100)
Subject: git-p4: seperate multiple statements onto seperate lines
X-Git-Tag: v2.37.0-rc0~101^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8f8b3b2a34fadaa559b25ec734c78ab9ef1228f;p=thirdparty%2Fgit.git

git-p4: seperate multiple statements onto seperate lines

PEP8 discourages the use of compound statements where there are multiple
statements on a single line in the "Other Recommendations" section:

https://www.python.org/dev/peps/pep-0008/#other-recommendations

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-p4.py b/git-p4.py
index 524a7a5c99..c3239cdabc 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1191,7 +1191,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
             else:
                 block_size = max(2, block_size // 2)
 
-            if verbose: print("block size error, retrying with block size {0}".format(block_size))
+            if verbose:
+                print("block size error, retrying with block size {0}".format(block_size))
             continue
         except P4Exception as e:
             die('Error retrieving changes description ({0})'.format(e.p4ExitCode))
@@ -1818,7 +1819,9 @@ class P4Submit(Command, P4UserMap):
                 (changelist, newUser))
 
         c = changes[0]
-        if c['User'] == newUser: return   # nothing to do
+        if c['User'] == newUser:
+            # Nothing to do
+            return
         c['User'] = newUser
         # p4 does not understand format version 3 and above
         input = marshal.dumps(c, 2)