Revision: 23823
Author: [email protected]
Date: Wed Sep 10 07:51:13 2014 UTC
Log: Make merge script bypass hooks on upload.
TEST=script_test.py
[email protected]
Review URL: https://codereview.chromium.org/558053002
https://code.google.com/p/v8/source/detail?r=23823
Modified:
/branches/bleeding_edge/tools/push-to-trunk/common_includes.py
/branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/common_includes.py Sun Sep
7 08:11:32 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/common_includes.py Wed Sep
10 07:51:13 2014 UTC
@@ -557,7 +557,8 @@
print "Please enter the email address of a V8 reviewer for your
patch: ",
self.DieNoManualMode("A reviewer must be specified in forced mode.")
reviewer = self.ReadLine()
- self.GitUpload(reviewer, self._options.author,
self._options.force_upload)
+ self.GitUpload(reviewer, self._options.author,
self._options.force_upload,
+ bypass_hooks=self._options.bypass_upload_hooks)
class DetermineV8Sheriff(Step):
@@ -680,6 +681,7 @@
# Defaults for options, common to all scripts.
options.manual = getattr(options, "manual", True)
options.force = getattr(options, "force", False)
+ options.bypass_upload_hooks = False
# Derived options.
options.requires_editor = not options.force
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Mon May
5 15:16:26 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Wed Sep
10 07:51:13 2014 UTC
@@ -309,6 +309,7 @@
if not options.message:
print "You must specify a merge comment if no patches are
specified"
return False
+ options.bypass_upload_hooks = True
return True
def _Steps(self):
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Sun Sep 7
08:11:32 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Wed Sep 10
07:51:13 2014 UTC
@@ -1142,7 +1142,8 @@
RL("Y"), # Automatically increment patch level?
Cmd("git commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""),
RL("[email protected]"), # V8 reviewer.
- Cmd("git cl upload --send-mail -r \"[email protected]\"", ""),
+ Cmd("git cl upload --send-mail -r \"[email protected]\" "
+ "--bypass-hooks", ""),
Cmd("git checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""),
RL("LGTM"), # Enter LGTM for V8 CL.
Cmd("git cl presubmit", "Presubmit successfull\n"),
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
