From: Joel Holdsworth <jholdsworth@nvidia.com>
Date: Fri, 1 Apr 2022 14:25:01 +0000 (+0100)
Subject: git-p4: only seperate code blocks by a single empty line
X-Git-Tag: v2.37.0-rc0~101^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77956b9de5266de6e597509a4d58e2f0bcafd09a;p=thirdparty%2Fgit.git

git-p4: only seperate code blocks by a single empty line

PEP8 recommends that blank lines should be used sparingly to separate
sections in the "Blank Lines" section:

https://www.python.org/dev/peps/pep-0008/#blank-lines

This patch replaces all double blank-line separations with a single
blank line.

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 2f2450f7d9..c003b6246d 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3521,7 +3521,6 @@ class P4Sync(Command, P4UserMap):
                 if source not in self.knownBranches:
                     lostAndFoundBranches.add(source)
 
-
         for branch in lostAndFoundBranches:
             self.knownBranches[branch] = branch
 
@@ -3745,7 +3744,6 @@ class P4Sync(Command, P4UserMap):
                 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
                 sys.exit(1)
 
-
             change = int(info["change"])
             if change > newestRevision:
                 newestRevision = change
@@ -3773,7 +3771,6 @@ class P4Sync(Command, P4UserMap):
             print("IO error details: {}".format(err))
             print(self.gitError.read())
 
-
     def importRevisions(self, args, branch_arg_given):
         changes = []