upload: respect --yes with large upload confirmation
If the user passes in --yes, don't prompt them to confirm large uploads.
Bug: https://crbug.com/gerrit/14085
Change-Id: Ic801b21be80ba181801531acd4af5057ec10c11c
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/343554
Reviewed-by: LaMont Jones <lamontjones@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/subcmds/upload.py b/subcmds/upload.py
index ac2ed14..d341458 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -262,7 +262,7 @@
answer = sys.stdin.readline().strip().lower()
answer = answer in ('y', 'yes', '1', 'true', 't')
- if answer:
+ if not opt.yes and answer:
if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
answer = _ConfirmManyUploads()
@@ -335,14 +335,15 @@
if not todo:
_die("nothing uncommented for upload")
- many_commits = False
- for branch in todo:
- if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
- many_commits = True
- break
- if many_commits:
- if not _ConfirmManyUploads(multiple_branches=True):
- _die("upload aborted by user")
+ if not opt.yes:
+ many_commits = False
+ for branch in todo:
+ if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
+ many_commits = True
+ break
+ if many_commits:
+ if not _ConfirmManyUploads(multiple_branches=True):
+ _die("upload aborted by user")
self._UploadAndReport(opt, todo, people)