diff options
| -rw-r--r-- | subcmds/cherry_pick.py | 2 | ||||
| -rw-r--r-- | subcmds/help.py | 2 | ||||
| -rw-r--r-- | subcmds/rebase.py | 2 | ||||
| -rw-r--r-- | subcmds/sync.py | 4 | ||||
| -rw-r--r-- | subcmds/upload.py | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index 01b97e07e..520e4c325 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py @@ -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) diff --git a/subcmds/help.py b/subcmds/help.py index 15aab7f9f..784288250 100644 --- a/subcmds/help.py +++ b/subcmds/help.py @@ -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): diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 06cda22ce..b9a7774d6 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py @@ -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 diff --git a/subcmds/sync.py b/subcmds/sync.py index 5c369a748..6c903ff44 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -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) diff --git a/subcmds/upload.py b/subcmds/upload.py index e314032aa..48ee685ce 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -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" |