diff options
author | Joel Holdsworth <jholdsworth@nvidia.com> | 2022-04-01 15:25:03 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-04-01 13:15:44 -0700 |
commit | e8f8b3b2a34fadaa559b25ec734c78ab9ef1228f (patch) | |
tree | 76f7f70146e0e94a2be9018e0732956bf505395b /git-p4.py | |
parent | 4768af208850ef3de74908c498acf9f8956cf545 (diff) | |
download | git-e8f8b3b2a34fadaa559b25ec734c78ab9ef1228f.tar.gz |
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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) |