kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-p4: normalize indentation of lines in conditionals 

PEP8 recommends that when wrapping the arguments of conditional
statements, an extra level of indentation should be added to distinguish
arguments from the body of the statement.

This guideline is described here:
https://www.python.org/dev/peps/pep-0008/#indentation

This patch either adds the indentation, or removes unnecessary wrapping.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Joel Holdsworth 2022-04-01 15:24:59 +01:00 committed by Junio C Hamano
parent 6febb9f843
commit 7a3e83d0bd
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git-p4.py
View File

@ -1085,8 +1085,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix="refs/remotes/p4/", silent=T
originHead = line

original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
if ('depot-paths' not in original
or 'change' not in original):
if 'depot-paths' not in original or 'change' not in original:
continue

update = False
@ -2098,8 +2097,8 @@ class P4Submit(Command, P4UserMap):
if regexp:
# this file is a possibility...look for RCS keywords.
for line in read_pipe_lines(
["git", "diff", "%s^..%s" % (id, id), file],
raw=True):
["git", "diff", "%s^..%s" % (id, id), file],
raw=True):
if regexp.search(line):
if verbose:
print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
@ -3112,9 +3111,9 @@ class P4Sync(Command, P4UserMap):
self.stream_file[k] = marshalled[k]

if (verbose and
'streamContentSize' in self.stream_file and
'fileSize' in self.stream_file and
'depotFile' in self.stream_file):
'streamContentSize' in self.stream_file and
'fileSize' in self.stream_file and
'depotFile' in self.stream_file):
size = int(self.stream_file["fileSize"])
if size > 0:
progress = 100*self.stream_file['streamContentSize']/size
@ -3930,8 +3929,7 @@ class P4Sync(Command, P4UserMap):
settings = extractSettingsGitLog(logMsg)

self.readOptions(settings)
if ('depot-paths' in settings
and 'change' in settings):
if 'depot-paths' in settings and 'change' in settings:
change = int(settings['change']) + 1
p4Change = max(p4Change, change)