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

git-p4: move inline comments to line above 

PEP8 recommends that all inline comments should be separated from code
by two spaces, in the "Inline Comments" section:

https://www.python.org/dev/peps/pep-0008/#inline-comments

However, because all instances of these inline comments extended to an
excessive line length, they have been moved onto a seprate line.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Joel Holdsworth 2022-04-01 15:25:02 +01:00 committed by Junio C Hamano
parent 77956b9de5
commit 4768af2088
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-p4.py
View File

@ -1979,7 +1979,9 @@ class P4Submit(Command, P4UserMap):
for line in f.readlines(): for line in f.readlines():
newdiff += "+" + line newdiff += "+" + line
except UnicodeDecodeError: except UnicodeDecodeError:
pass # Found non-text data and skip, since diff description should only include text # Found non-text data and skip, since diff description
# should only include text
pass
f.close() f.close()


return (diff + newdiff).replace('\r\n', '\n') return (diff + newdiff).replace('\r\n', '\n')
@ -2975,7 +2977,8 @@ class P4Sync(Command, P4UserMap):
if 'fileSize' in self.stream_file: if 'fileSize' in self.stream_file:
size = int(self.stream_file['fileSize']) size = int(self.stream_file['fileSize'])
else: else:
size = 0 # deleted files don't get a fileSize apparently # Deleted files don't get a fileSize apparently
size = 0
sys.stdout.write('\r%s --> %s (%s)\n' % ( sys.stdout.write('\r%s --> %s (%s)\n' % (
file_path, relPath, format_size_human_readable(size))) file_path, relPath, format_size_human_readable(size)))
sys.stdout.flush() sys.stdout.flush()
@ -4233,7 +4236,8 @@ class P4Unshelve(Command):
for i in range(0, 1000): for i in range(0, 1000):
backup_branch_name = "{0}.{1}".format(branch_name, i) backup_branch_name = "{0}.{1}".format(branch_name, i)
if not gitBranchExists(backup_branch_name): if not gitBranchExists(backup_branch_name):
gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup # Copy ref to backup
gitUpdateRef(backup_branch_name, branch_name)
gitDeleteRef(branch_name) gitDeleteRef(branch_name)
found = True found = True
print("renamed old unshelve branch to {0}".format(backup_branch_name)) print("renamed old unshelve branch to {0}".format(backup_branch_name))