Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

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

Issue 223753002: Add merged patches to commit title in merge-to-branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 8 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile() 978 TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
979 TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile() 979 TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
980 self.WriteFakeVersionFile(build=5) 980 self.WriteFakeVersionFile(build=5)
981 os.environ["EDITOR"] = "vi" 981 os.environ["EDITOR"] = "vi"
982 extra_patch = self.MakeEmptyTempFile() 982 extra_patch = self.MakeEmptyTempFile()
983 983
984 def VerifyPatch(patch): 984 def VerifyPatch(patch):
985 return lambda: self.assertEquals(patch, 985 return lambda: self.assertEquals(patch,
986 FileToText(TEST_CONFIG[TEMPORARY_PATCH_FILE])) 986 FileToText(TEST_CONFIG[TEMPORARY_PATCH_FILE]))
987 987
988 msg = """Version 3.22.5.1 988 msg = """Version 3.22.5.1 (merged r12345, r23456, r34567, r45678, r56789)
989
990 Merged r12345, r23456, r34567, r45678, r56789 into trunk branch.
991 989
992 Title4 990 Title4
993 991
994 Title2 992 Title2
995 993
996 Title3 994 Title3
997 995
998 Title1 996 Title1
999 997
1000 Title5 998 Title5
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 1116
1119 Review URL: https://codereview.chromium.org/83173002 1117 Review URL: https://codereview.chromium.org/83173002
1120 1118
1121 ------------------------------------------------------------------------""") 1119 ------------------------------------------------------------------------""")
1122 self.assertEquals( 1120 self.assertEquals(
1123 """Prepare push to trunk. Now working on version 3.23.11. 1121 """Prepare push to trunk. Now working on version 3.23.11.
1124 1122
1125 R=danno@chromium.org 1123 R=danno@chromium.org
1126 1124
1127 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) 1125 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)
OLDNEW
« no previous file with comments | « tools/push-to-trunk/merge_to_branch.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698