git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-14 18:43:41 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

git-p4: seperate multiple statements onto seperate lines

Browse Source 
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>
This commit is contained in:
Joel Holdsworth 2022-04-01 15:25:03 +01:00 committed by Junio C Hamano
parent 4768af2088
commit e8f8b3b2a3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-p4.py
View File

@ -1191,7 +1191,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
else: else:
block_size = max(2, block_size // 2) 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 continue
except P4Exception as e: except P4Exception as e:
die('Error retrieving changes description ({0})'.format(e.p4ExitCode)) die('Error retrieving changes description ({0})'.format(e.p4ExitCode))
@ -1818,7 +1819,9 @@ class P4Submit(Command, P4UserMap):
(changelist, newUser)) (changelist, newUser))
c = changes[0] c = changes[0]
if c['User'] == newUser: return # nothing to do if c['User'] == newUser:
# Nothing to do
return
c['User'] = newUser c['User'] = newUser
# p4 does not understand format version 3 and above # p4 does not understand format version 3 and above
input = marshal.dumps(c, 2) input = marshal.dumps(c, 2)