summaryrefslogtreecommitdiffstats
path: root/subcmds/upload.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/upload.py')
-rw-r--r--subcmds/upload.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py
index a08926c6..c152e75d 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -73,7 +73,7 @@ Configuration
73 73
74review.URL.autoupload: 74review.URL.autoupload:
75 75
76To disable the "Upload ... (y/n)?" prompt, you can set a per-project 76To disable the "Upload ... (y/N)?" prompt, you can set a per-project
77or global Git configuration option. If review.URL.autoupload is set 77or global Git configuration option. If review.URL.autoupload is set
78to "true" then repo will assume you always answer "y" at the prompt, 78to "true" then repo will assume you always answer "y" at the prompt,
79and will not prompt you further. If it is set to "false" then repo 79and will not prompt you further. If it is set to "false" then repo
@@ -171,7 +171,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
171 for commit in list: 171 for commit in list:
172 print ' %s' % commit 172 print ' %s' % commit
173 173
174 sys.stdout.write('to %s (y/n)? ' % remote.review) 174 sys.stdout.write('to %s (y/N)? ' % remote.review)
175 answer = sys.stdin.readline().strip() 175 answer = sys.stdin.readline().strip()
176 answer = answer in ('y', 'Y', 'yes', '1', 'true', 't') 176 answer = answer in ('y', 'Y', 'yes', '1', 'true', 't')
177 177
@@ -299,7 +299,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
299 299
300 # if they want to auto upload, let's not ask because it could be automated 300 # if they want to auto upload, let's not ask because it could be automated
301 if answer is None: 301 if answer is None:
302 sys.stdout.write('Uncommitted changes in ' + branch.project.name + ' (did you forget to amend?). Continue uploading? (y/n) ') 302 sys.stdout.write('Uncommitted changes in ' + branch.project.name + ' (did you forget to amend?). Continue uploading? (y/N) ')
303 a = sys.stdin.readline().strip().lower() 303 a = sys.stdin.readline().strip().lower()
304 if a not in ('y', 'yes', 't', 'true', 'on'): 304 if a not in ('y', 'yes', 't', 'true', 'on'):
305 print >>sys.stderr, "skipping upload" 305 print >>sys.stderr, "skipping upload"