mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
git-p4: remove redundant backslash-continuations inside brackets
PEP8 recommends that backslash line continuations should only be used for line-breaks outside parentheses. This recommendation is described in the "Maximum Line Length" section: https://www.python.org/dev/peps/pep-0008/#maximum-line-length Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
843d847ff7
commit
968e29e16b
18
git-p4.py
18
git-p4.py
|
@ -2201,13 +2201,13 @@ def applyCommit(self, id):
|
|||
print(" " + self.clientPath)
|
||||
print("")
|
||||
print("To submit, use \"p4 submit\" to write a new description,")
|
||||
print("or \"p4 submit -i <%s\" to use the one prepared by" \
|
||||
print("or \"p4 submit -i <%s\" to use the one prepared by"
|
||||
" \"git p4\"." % fileName)
|
||||
print("You can delete the file \"%s\" when finished." % fileName)
|
||||
|
||||
if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
|
||||
print("To preserve change ownership by user %s, you must\n" \
|
||||
"do \"p4 change -f <change>\" after submitting and\n" \
|
||||
print("To preserve change ownership by user %s, you must\n"
|
||||
"do \"p4 change -f <change>\" after submitting and\n"
|
||||
"edit the User field.")
|
||||
if pureRenameCopy:
|
||||
print("After submitting, renamed files must be re-synced.")
|
||||
|
@ -2350,7 +2350,7 @@ def exportGitTags(self, gitTags):
|
|||
if self.dry_run:
|
||||
print("Would create p4 label %s for tag" % name)
|
||||
elif self.prepare_p4_only:
|
||||
print("Not creating p4 label %s for tag due to option" \
|
||||
print("Not creating p4 label %s for tag due to option"
|
||||
" --prepare-p4-only" % name)
|
||||
else:
|
||||
p4_write_pipe(["label", "-i"], labelTemplate)
|
||||
|
@ -2515,12 +2515,12 @@ def run(self, args):
|
|||
if not self.no_verify:
|
||||
try:
|
||||
if not run_git_hook("p4-pre-submit"):
|
||||
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \
|
||||
"this pre-submission check by adding\nthe command line option '--no-verify', " \
|
||||
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip "
|
||||
"this pre-submission check by adding\nthe command line option '--no-verify', "
|
||||
"however,\nthis will also skip the p4-changelist hook as well.")
|
||||
sys.exit(1)
|
||||
except Exception as e:
|
||||
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
|
||||
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "
|
||||
"with the error '{0}'".format(e.message))
|
||||
sys.exit(1)
|
||||
|
||||
|
@ -2543,7 +2543,7 @@ def run(self, args):
|
|||
applied.append(commit)
|
||||
if self.prepare_p4_only:
|
||||
if i < last:
|
||||
print("Processing only the first commit due to option" \
|
||||
print("Processing only the first commit due to option"
|
||||
" --prepare-p4-only")
|
||||
break
|
||||
else:
|
||||
|
@ -4206,7 +4206,7 @@ def run(self, args):
|
|||
if not self.cloneBare:
|
||||
system(["git", "checkout", "-f"])
|
||||
else:
|
||||
print('Not checking out any branch, use ' \
|
||||
print('Not checking out any branch, use '
|
||||
'"git checkout -q -b master <branch>"')
|
||||
|
||||
# auto-set this variable if invoked with --use-client-spec
|
||||
|
|
Loading…
Reference in a new issue