Merge "Fix: Missing spaces in printed messages"

This commit is contained in:
David Pursehouse 2013-03-06 00:46:45 +00:00 committed by Gerrit Code Review
commit 3ee6ffd078
5 changed files with 7 additions and 7 deletions

View File

@ -81,7 +81,7 @@ change id will be added.
sys.exit(1)
else:
print('NOTE: When committing (please see above) and editing the commit'
print('NOTE: When committing (please see above) and editing the commit '
'message, please remove the old Change-Id-line and add:')
print(self._GetReference(sha1), file=sys.stderr)
print(file=sys.stderr)

View File

@ -49,7 +49,7 @@ Displays detailed usage information about a command.
except AttributeError:
summary = ''
print(fmt % (name, summary))
print("See 'repo help <command>' for more information on a"
print("See 'repo help <command>' for more information on a "
'specific command.')
def _PrintCommonCommands(self):

View File

@ -68,7 +68,7 @@ branch but need to incorporate new upstream changes "underneath" them.
cb = project.CurrentBranch
if not cb:
if one_project:
print("error: project %s has a detatched HEAD" % project.relpath,
print("error: project %s has a detached HEAD" % project.relpath,
file=sys.stderr)
return -1
# ignore branches with detatched HEADs

View File

@ -406,7 +406,7 @@ later is required to fix a server side protocol bug.
groups = None)
if project.IsDirty():
print('error: Cannot remove project "%s": uncommitted changes'
print('error: Cannot remove project "%s": uncommitted changes '
'are present' % project.relpath, file=sys.stderr)
print(' commit changes, then run sync again',
file=sys.stderr)
@ -466,7 +466,7 @@ later is required to fix a server side protocol bug.
if opt.smart_sync or opt.smart_tag:
if not self.manifest.manifest_server:
print('error: cannot smart sync: no manifest server defined in'
print('error: cannot smart sync: no manifest server defined in '
'manifest', file=sys.stderr)
sys.exit(1)

View File

@ -27,11 +27,11 @@ UNUSUAL_COMMIT_THRESHOLD = 5
def _ConfirmManyUploads(multiple_branches=False):
if multiple_branches:
print('ATTENTION: One or more branches has an unusually high number'
print('ATTENTION: One or more branches has an unusually high number '
'of commits.')
else:
print('ATTENTION: You are uploading an unusually high number of commits.')
print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across'
print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across '
'branches?)')
answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip()
return answer == "yes"