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>
This commit is contained in:

committed by
Junio C Hamano

parent
da0134f653
commit
77956b9de5
@ -3521,7 +3521,6 @@ class P4Sync(Command, P4UserMap):
|
|||||||
if source not in self.knownBranches:
|
if source not in self.knownBranches:
|
||||||
lostAndFoundBranches.add(source)
|
lostAndFoundBranches.add(source)
|
||||||
|
|
||||||
|
|
||||||
for branch in lostAndFoundBranches:
|
for branch in lostAndFoundBranches:
|
||||||
self.knownBranches[branch] = branch
|
self.knownBranches[branch] = branch
|
||||||
|
|
||||||
@ -3745,7 +3744,6 @@ class P4Sync(Command, P4UserMap):
|
|||||||
sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
|
sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
change = int(info["change"])
|
change = int(info["change"])
|
||||||
if change > newestRevision:
|
if change > newestRevision:
|
||||||
newestRevision = change
|
newestRevision = change
|
||||||
@ -3773,7 +3771,6 @@ class P4Sync(Command, P4UserMap):
|
|||||||
print("IO error details: {}".format(err))
|
print("IO error details: {}".format(err))
|
||||||
print(self.gitError.read())
|
print(self.gitError.read())
|
||||||
|
|
||||||
|
|
||||||
def importRevisions(self, args, branch_arg_given):
|
def importRevisions(self, args, branch_arg_given):
|
||||||
changes = []
|
changes = []
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user