AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[release] Drop comment in merge-to-branch script

Browse Source 
BUG=v8:6030
NOTRY=true
TBR=hablich@chromium.org

Change-Id: I28815078e1f3d27411fa985df35ff70ac49dbcb4
Reviewed-on: https://chromium-review.googlesource.com/449833
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43585}
This commit is contained in:
Michael Achenbach 2017-03-03 14:24:03 +01:00 committed by Commit Bot
parent 6a0acc135e
commit f302c3012c
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/release/git_recipes.py
View File

@ -244,10 +244,6 @@ class GitRecipesMixin(object):
self.Git( self.Git(
"cl land -f --bypass-hooks", retry_on=lambda x: x is None, **kwargs) "cl land -f --bypass-hooks", retry_on=lambda x: x is None, **kwargs)
def GitCLAddComment(self, message, **kwargs):
args = ["cl", "comments", "-a", Quoted(message)]
self.Git(MakeArgs(args), **kwargs)
def GitDiff(self, loc1, loc2, **kwargs): def GitDiff(self, loc1, loc2, **kwargs):
return self.Git(MakeArgs(["diff", loc1, loc2]), **kwargs) return self.Git(MakeArgs(["diff", loc1, loc2]), **kwargs)

12
tools/release/merge_to_branch.py
View File

@ -166,17 +166,6 @@ class CommitLocal(Step):
TextToFile(self["new_commit_msg"], self.Config("COMMITMSG_FILE")) TextToFile(self["new_commit_msg"], self.Config("COMMITMSG_FILE"))
self.GitCommit(file_name=self.Config("COMMITMSG_FILE")) self.GitCommit(file_name=self.Config("COMMITMSG_FILE"))
class AddInformationalComment(Step):
MESSAGE = 'Show additional information.'
def RunStep(self):
message = ("NOTE: This script will no longer automatically "
"update include/v8-version.h "
"and create a tag. This is done automatically by the autotag bot. "
"Please call the merge_to_branch.py with --help for more information.")
self.GitCLAddComment(message)
class CommitRepository(Step): class CommitRepository(Step):
MESSAGE = "Commit to the repository." MESSAGE = "Commit to the repository."
@ -262,7 +251,6 @@ class MergeToBranch(ScriptsBase):
ApplyPatches, ApplyPatches,
CommitLocal, CommitLocal,
UploadStep, UploadStep,
AddInformationalComment,
CommitRepository, CommitRepository,
CleanUp, CleanUp,
] ]

1
tools/release/test_scripts.py
View File

@ -1654,7 +1654,6 @@ NOTREECHECKS=true
RL("reviewer@chromium.org"), # V8 reviewer. RL("reviewer@chromium.org"), # V8 reviewer.
Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" " Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
"--bypass-hooks --cc \"ulan@chromium.org\" --gerrit", ""), "--bypass-hooks --cc \"ulan@chromium.org\" --gerrit", ""),
Cmd("git cl comments -a \"%s\"" % info_msg, ""),
Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""), Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
RL("LGTM"), # Enter LGTM for V8 CL. RL("LGTM"), # Enter LGTM for V8 CL.
Cmd("git cl presubmit", "Presubmit successfull\n"), Cmd("git cl presubmit", "Presubmit successfull\n"),