tools/push-to-trunk/test_scripts.py - Issue 181603002: Fix patch creation in merge-to-branch script.

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

Issue 181603002: Fix patch creation in merge-to-branch script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 9 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 932 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
943 "", VerifyPatch("patch4")],	943 "", VerifyPatch("patch4")],

944 ["log -1 -p hash2", "patch2"],	944 ["log -1 -p hash2", "patch2"],

945 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],	945 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],

946 "", VerifyPatch("patch2")],	946 "", VerifyPatch("patch2")],

947 ["log -1 -p hash3", "patch3"],	947 ["log -1 -p hash3", "patch3"],

948 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],	948 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],

949 "", VerifyPatch("patch3")],	949 "", VerifyPatch("patch3")],

950 ["log -1 -p hash1", "patch1"],	950 ["log -1 -p hash1", "patch1"],

951 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],	951 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],

952 "", VerifyPatch("patch1")],	952 "", VerifyPatch("patch1")],

953 ["log -1 -p hash5", "patch5"],	953 ["log -1 -p hash5", "patch5\n"],

954 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],	954 ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],

955 "", VerifyPatch("patch5")],	955 "", VerifyPatch("patch5\n")],

956 ["apply --index --reject \"%s\"" % extra_patch, ""],	956 ["apply --index --reject \"%s\"" % extra_patch, ""],

957 ["commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""],	957 ["commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""],

958 ["cl upload --send-mail -r \"reviewer@chromium.org\"", ""],	958 ["cl upload --send-mail -r \"reviewer@chromium.org\"", ""],

959 ["checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""],	959 ["checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""],

960 ["cl presubmit", "Presubmit successfull\n"],	960 ["cl presubmit", "Presubmit successfull\n"],

961 ["cl dcommit -f --bypass-hooks", "Closing issue\n", VerifySVNCommit],	961 ["cl dcommit -f --bypass-hooks", "Closing issue\n", VerifySVNCommit],

962 ["svn fetch", ""],	962 ["svn fetch", ""],

963 ["log -1 --format=%%H --grep=\"%s\" svn/trunk" % msg, "hash6"],	963 ["log -1 --format=%%H --grep=\"%s\" svn/trunk" % msg, "hash6"],

964 ["svn find-rev hash6", "1324"],	964 ["svn find-rev hash6", "1324"],

965 [("copy -r 1324 https://v8.googlecode.com/svn/trunk "	965 [("copy -r 1324 https://v8.googlecode.com/svn/trunk "

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1010	1010

1011 Review URL: https://codereview.chromium.org/83173002	1011 Review URL: https://codereview.chromium.org/83173002

1012	1012

1013 ------------------------------------------------------------------------""")	1013 ------------------------------------------------------------------------""")

1014 self.assertEquals(	1014 self.assertEquals(

1015 """Prepare push to trunk. Now working on version 3.23.11.	1015 """Prepare push to trunk. Now working on version 3.23.11.

1016	1016

1017 R=danno@chromium.org	1017 R=danno@chromium.org

1018	1018

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

OLD	NEW