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

Side by Side Diff: tools/release/roll_merge.py

Issue 1398033003: [Release] Update merge script to leverage auto-tag bot (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Truncate title more meaningful Created 4 years, 5 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
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 the V8 project authors. All rights reserved. 2 # Copyright 2014 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 def RunStep(self): 214 def RunStep(self):
215 self.CommonCleanup() 215 self.CommonCleanup()
216 print "*** SUMMARY ***" 216 print "*** SUMMARY ***"
217 print "version: %s" % self["version"] 217 print "version: %s" % self["version"]
218 print "branch: %s" % self["merge_to_branch"] 218 print "branch: %s" % self["merge_to_branch"]
219 if self["revision_list"]: 219 if self["revision_list"]:
220 print "patches: %s" % self["revision_list"] 220 print "patches: %s" % self["revision_list"]
221 221
222 222
223 class MergeToBranch(ScriptsBase): 223 class RollMerge(ScriptsBase):
224 def _Description(self): 224 def _Description(self):
225 return ("Performs the necessary steps to merge revisions from " 225 return ("Performs the necessary steps to merge revisions from "
226 "master to other branches, including candidates.") 226 "master to other branches, including candidates and roll branches.")
227 227
228 def _PrepareOptions(self, parser): 228 def _PrepareOptions(self, parser):
229 group = parser.add_mutually_exclusive_group(required=True) 229 group = parser.add_mutually_exclusive_group(required=True)
230 group.add_argument("--branch", help="The branch to merge to.") 230 group.add_argument("--branch", help="The branch to merge to.")
231 parser.add_argument("revisions", nargs="*", 231 parser.add_argument("revisions", nargs="*",
232 help="The revisions to merge.") 232 help="The revisions to merge.")
233 parser.add_argument("-f", "--force", 233 parser.add_argument("-f", "--force",
234 help="Delete sentinel file.", 234 help="Delete sentinel file.",
235 default=False, action="store_true") 235 default=False, action="store_true")
236 parser.add_argument("-m", "--message", 236 parser.add_argument("-m", "--message",
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 IncrementVersion, 280 IncrementVersion,
281 CommitLocal, 281 CommitLocal,
282 UploadStep, 282 UploadStep,
283 CommitRepository, 283 CommitRepository,
284 TagRevision, 284 TagRevision,
285 CleanUp, 285 CleanUp,
286 ] 286 ]
287 287
288 288
289 if __name__ == "__main__": # pragma: no cover 289 if __name__ == "__main__": # pragma: no cover
290 sys.exit(MergeToBranch().Run()) 290 sys.exit(RollMerge().Run())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698