tools/push-to-trunk/test_scripts.py - Issue 558053002: Make merge script bypass hooks on upload.

Side by Side Diff: tools/push-to-trunk/test_scripts.py

Issue 558053002: Make merge script bypass hooks on upload. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « tools/push-to-trunk/merge_to_branch.py ('k') | no next file » | no next file with comments »

OLD	NEW
1 #!/usr/bin/env python	1 #!/usr/bin/env python

2 # Copyright 2013 the V8 project authors. All rights reserved.	2 # Copyright 2013 the V8 project authors. All rights reserved.

3 # Redistribution and use in source and binary forms, with or without	3 # Redistribution and use in source and binary forms, with or without

4 # modification, are permitted provided that the following conditions are	4 # modification, are permitted provided that the following conditions are

5 # met:	5 # met:

6 #	6 #

7 # * Redistributions of source code must retain the above copyright	7 # * Redistributions of source code must retain the above copyright

8 # notice, this list of conditions and the following disclaimer.	8 # notice, this list of conditions and the following disclaimer.

9 # * Redistributions in binary form must reproduce the above	9 # * Redistributions in binary form must reproduce the above

10 # copyright notice, this list of conditions and the following	10 # copyright notice, this list of conditions and the following

(...skipping 1124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1135 TEST_CONFIG[TEMPORARY_PATCH_FILE]),	1135 TEST_CONFIG[TEMPORARY_PATCH_FILE]),

1136 "", cb=VerifyPatch("patch1")),	1136 "", cb=VerifyPatch("patch1")),

1137 Cmd("git log -1 -p hash5", "patch5\n"),	1137 Cmd("git log -1 -p hash5", "patch5\n"),

1138 Cmd(("git apply --index --reject \"%s\"" %	1138 Cmd(("git apply --index --reject \"%s\"" %

1139 TEST_CONFIG[TEMPORARY_PATCH_FILE]),	1139 TEST_CONFIG[TEMPORARY_PATCH_FILE]),

1140 "", cb=VerifyPatch("patch5\n")),	1140 "", cb=VerifyPatch("patch5\n")),

1141 Cmd("git apply --index --reject \"%s\"" % extra_patch, ""),	1141 Cmd("git apply --index --reject \"%s\"" % extra_patch, ""),

1142 RL("Y"), # Automatically increment patch level?	1142 RL("Y"), # Automatically increment patch level?

1143 Cmd("git commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""),	1143 Cmd("git commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""),

1144 RL("reviewer@chromium.org"), # V8 reviewer.	1144 RL("reviewer@chromium.org"), # V8 reviewer.

1145 Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\"", ""),	1145 Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "

	1146 "--bypass-hooks", ""),

1146 Cmd("git checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""),	1147 Cmd("git checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""),

1147 RL("LGTM"), # Enter LGTM for V8 CL.	1148 RL("LGTM"), # Enter LGTM for V8 CL.

1148 Cmd("git cl presubmit", "Presubmit successfull\n"),	1149 Cmd("git cl presubmit", "Presubmit successfull\n"),

1149 Cmd("git cl dcommit -f --bypass-hooks", "Closing issue\n",	1150 Cmd("git cl dcommit -f --bypass-hooks", "Closing issue\n",

1150 cb=VerifySVNCommit),	1151 cb=VerifySVNCommit),

1151 Cmd("git svn fetch", ""),	1152 Cmd("git svn fetch", ""),

1152 Cmd(("git log -1 --format=%%H --grep=\"%s\" svn/trunk"	1153 Cmd(("git log -1 --format=%%H --grep=\"%s\" svn/trunk"

1153 % msg.replace("\"", "\\\"")), "hash6"),	1154 % msg.replace("\"", "\\\"")), "hash6"),

1154 Cmd("git svn find-rev hash6", "1324"),	1155 Cmd("git svn find-rev hash6", "1324"),

1155 Cmd(("svn copy -r 1324 https://v8.googlecode.com/svn/trunk "	1156 Cmd(("svn copy -r 1324 https://v8.googlecode.com/svn/trunk "

(...skipping 395 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1551	1552

1552 Review URL: https://codereview.chromium.org/83173002	1553 Review URL: https://codereview.chromium.org/83173002

1553	1554

1554 ------------------------------------------------------------------------""")	1555 ------------------------------------------------------------------------""")

1555 self.assertEquals(	1556 self.assertEquals(

1556 """Prepare push to trunk. Now working on version 3.23.11.	1557 """Prepare push to trunk. Now working on version 3.23.11.

1557	1558

1558 R=danno@chromium.org	1559 R=danno@chromium.org

1559	1560

1560 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)	1561 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)

OLD	NEW