summaryrefslogtreecommitdiffstats
path: root/subcmds
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2013-03-05 17:26:46 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2013-03-05 17:30:59 +0900
commit2f9e7e40c44acae37d0c263c212956ef6038c35b (patch)
treeb5bffccb2c4f6a502a350bef3e40183f56ca8bc9 /subcmds
parent45d21685b93f80b67239849b2d2cfe6b217e335a (diff)
downloadgit-repo-2f9e7e40c44acae37d0c263c212956ef6038c35b.tar.gz
Fix: Missing spaces in printed messages
Several messages are printed with the `print` method and the message is split across two lines, i.e.: print('This is a message split' 'across two source code lines') Which causes the message to be printed as: This is a message splitacross two source code lines Add a space at the end of the first line before the line break: print('This is a message split ' 'across two source code lines' Also correct a minor spelling mistake. Change-Id: Ib98d93fcfb98d78f48025fcc428b6661380cff79
Diffstat (limited to 'subcmds')
-rw-r--r--subcmds/cherry_pick.py2
-rw-r--r--subcmds/help.py2
-rw-r--r--subcmds/rebase.py2
-rw-r--r--subcmds/sync.py4
-rw-r--r--subcmds/upload.py4
5 files changed, 7 insertions, 7 deletions
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index 01b97e07..520e4c32 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -81,7 +81,7 @@ change id will be added.
81 sys.exit(1) 81 sys.exit(1)
82 82
83 else: 83 else:
84 print('NOTE: When committing (please see above) and editing the commit' 84 print('NOTE: When committing (please see above) and editing the commit '
85 'message, please remove the old Change-Id-line and add:') 85 'message, please remove the old Change-Id-line and add:')
86 print(self._GetReference(sha1), file=sys.stderr) 86 print(self._GetReference(sha1), file=sys.stderr)
87 print(file=sys.stderr) 87 print(file=sys.stderr)
diff --git a/subcmds/help.py b/subcmds/help.py
index 15aab7f9..78428825 100644
--- a/subcmds/help.py
+++ b/subcmds/help.py
@@ -49,7 +49,7 @@ Displays detailed usage information about a command.
49 except AttributeError: 49 except AttributeError:
50 summary = '' 50 summary = ''
51 print(fmt % (name, summary)) 51 print(fmt % (name, summary))
52 print("See 'repo help <command>' for more information on a" 52 print("See 'repo help <command>' for more information on a "
53 'specific command.') 53 'specific command.')
54 54
55 def _PrintCommonCommands(self): 55 def _PrintCommonCommands(self):
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 06cda22c..b9a7774d 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -68,7 +68,7 @@ branch but need to incorporate new upstream changes "underneath" them.
68 cb = project.CurrentBranch 68 cb = project.CurrentBranch
69 if not cb: 69 if not cb:
70 if one_project: 70 if one_project:
71 print("error: project %s has a detatched HEAD" % project.relpath, 71 print("error: project %s has a detached HEAD" % project.relpath,
72 file=sys.stderr) 72 file=sys.stderr)
73 return -1 73 return -1
74 # ignore branches with detatched HEADs 74 # ignore branches with detatched HEADs
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 5c369a74..6c903ff4 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -406,7 +406,7 @@ later is required to fix a server side protocol bug.
406 groups = None) 406 groups = None)
407 407
408 if project.IsDirty(): 408 if project.IsDirty():
409 print('error: Cannot remove project "%s": uncommitted changes' 409 print('error: Cannot remove project "%s": uncommitted changes '
410 'are present' % project.relpath, file=sys.stderr) 410 'are present' % project.relpath, file=sys.stderr)
411 print(' commit changes, then run sync again', 411 print(' commit changes, then run sync again',
412 file=sys.stderr) 412 file=sys.stderr)
@@ -466,7 +466,7 @@ later is required to fix a server side protocol bug.
466 466
467 if opt.smart_sync or opt.smart_tag: 467 if opt.smart_sync or opt.smart_tag:
468 if not self.manifest.manifest_server: 468 if not self.manifest.manifest_server:
469 print('error: cannot smart sync: no manifest server defined in' 469 print('error: cannot smart sync: no manifest server defined in '
470 'manifest', file=sys.stderr) 470 'manifest', file=sys.stderr)
471 sys.exit(1) 471 sys.exit(1)
472 472
diff --git a/subcmds/upload.py b/subcmds/upload.py
index e314032a..48ee685c 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -27,11 +27,11 @@ UNUSUAL_COMMIT_THRESHOLD = 5
27 27
28def _ConfirmManyUploads(multiple_branches=False): 28def _ConfirmManyUploads(multiple_branches=False):
29 if multiple_branches: 29 if multiple_branches:
30 print('ATTENTION: One or more branches has an unusually high number' 30 print('ATTENTION: One or more branches has an unusually high number '
31 'of commits.') 31 'of commits.')
32 else: 32 else:
33 print('ATTENTION: You are uploading an unusually high number of commits.') 33 print('ATTENTION: You are uploading an unusually high number of commits.')
34 print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across' 34 print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across '
35 'branches?)') 35 'branches?)')
36 answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip() 36 answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip()
37 return answer == "yes" 37 return answer == "yes"