Commit 599ee834 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[release] Remove deprecated arguments from auto roller

TBR=sigurds@chromium.org
NOTRY=true

Bug: v8:8310
Change-Id: I83b250ffa89deb59fc10434806db25893ffed375
Reviewed-on: https://chromium-review.googlesource.com/c/1282564Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56664}
parent f69bc879
...@@ -156,8 +156,7 @@ class UploadCL(Step): ...@@ -156,8 +156,7 @@ class UploadCL(Step):
self.GitCommit("\n\n".join(message), author=self._options.author, cwd=cwd) self.GitCommit("\n\n".join(message), author=self._options.author, cwd=cwd)
if not self._options.dry_run: if not self._options.dry_run:
self.GitUpload(author=self._options.author, self.GitUpload(force=True,
force=True,
bypass_hooks=True, bypass_hooks=True,
cq=self._options.use_commit_queue, cq=self._options.use_commit_queue,
cq_dry_run=self._options.use_dry_run, cq_dry_run=self._options.use_dry_run,
......
...@@ -782,7 +782,7 @@ class UploadStep(Step): ...@@ -782,7 +782,7 @@ class UploadStep(Step):
self.DieNoManualMode("A reviewer must be specified in forced mode.") self.DieNoManualMode("A reviewer must be specified in forced mode.")
reviewer = self.ReadLine() reviewer = self.ReadLine()
self.GitUpload(reviewer, self._options.author, self._options.force_upload, self.GitUpload(reviewer, self._options.force_upload,
bypass_hooks=self._options.bypass_upload_hooks, bypass_hooks=self._options.bypass_upload_hooks,
cc=self._options.cc, tbr_reviewer=tbr_reviewer) cc=self._options.cc, tbr_reviewer=tbr_reviewer)
......
...@@ -219,8 +219,7 @@ class LandBranch(Step): ...@@ -219,8 +219,7 @@ class LandBranch(Step):
if self._options.dry_run: if self._options.dry_run:
print "Dry run - upload CL." print "Dry run - upload CL."
else: else:
self.GitUpload(author=self._options.author, self.GitUpload(force=True,
force=True,
bypass_hooks=True, bypass_hooks=True,
no_autocc=True) no_autocc=True)
cmd = "cl land --bypass-hooks -f" cmd = "cl land --bypass-hooks -f"
......
...@@ -205,12 +205,10 @@ class GitRecipesMixin(object): ...@@ -205,12 +205,10 @@ class GitRecipesMixin(object):
args.append(Quoted(patch_file)) args.append(Quoted(patch_file))
self.Git(MakeArgs(args), **kwargs) self.Git(MakeArgs(args), **kwargs)
def GitUpload(self, reviewer="", author="", force=False, cq=False, def GitUpload(self, reviewer="", force=False, cq=False,
cq_dry_run=False, bypass_hooks=False, cc="", tbr_reviewer="", cq_dry_run=False, bypass_hooks=False, cc="", tbr_reviewer="",
no_autocc=False, **kwargs): no_autocc=False, **kwargs):
args = ["cl upload --send-mail"] args = ["cl upload --send-mail"]
if author:
args += ["--email", Quoted(author)]
if reviewer: if reviewer:
args += ["-r", Quoted(reviewer)] args += ["-r", Quoted(reviewer)]
if tbr_reviewer: if tbr_reviewer:
......
...@@ -933,7 +933,7 @@ TBR=reviewer@chromium.org""" ...@@ -933,7 +933,7 @@ TBR=reviewer@chromium.org"""
cb=self.WriteFakeWatchlistsFile), cb=self.WriteFakeWatchlistsFile),
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
cb=CheckVersionCommit), cb=CheckVersionCommit),
Cmd("git cl upload --send-mail --email \"author@chromium.org\" " Cmd("git cl upload --send-mail "
"-f --bypass-hooks --no-autocc --gerrit", ""), "-f --bypass-hooks --no-autocc --gerrit", ""),
Cmd("git cl land --bypass-hooks -f", ""), Cmd("git cl land --bypass-hooks -f", ""),
Cmd("git fetch", ""), Cmd("git fetch", ""),
...@@ -1087,7 +1087,7 @@ deps = { ...@@ -1087,7 +1087,7 @@ deps = {
"--author \"author@chromium.org <author@chromium.org>\"" % "--author \"author@chromium.org <author@chromium.org>\"" %
self.ROLL_COMMIT_MSG), self.ROLL_COMMIT_MSG),
"", cwd=chrome_dir), "", cwd=chrome_dir),
Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f " Cmd("git cl upload --send-mail -f "
"--cq-dry-run --bypass-hooks --gerrit", "", "--cq-dry-run --bypass-hooks --gerrit", "",
cwd=chrome_dir), cwd=chrome_dir),
Cmd("git checkout -f master", "", cwd=chrome_dir), Cmd("git checkout -f master", "", cwd=chrome_dir),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment