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

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

Issue 716153002: Switch release scripts to pure git. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Review. Created 6 years, 1 month 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
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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 if not options.patch: 269 if not options.patch:
270 print "Either a patch file or revision numbers must be specified" 270 print "Either a patch file or revision numbers must be specified"
271 return False 271 return False
272 if not options.message: 272 if not options.message:
273 print "You must specify a merge comment if no patches are specified" 273 print "You must specify a merge comment if no patches are specified"
274 return False 274 return False
275 options.bypass_upload_hooks = True 275 options.bypass_upload_hooks = True
276 # CC ulan to make sure that fixes are merged to Google3. 276 # CC ulan to make sure that fixes are merged to Google3.
277 options.cc = "ulan@chromium.org" 277 options.cc = "ulan@chromium.org"
278 278
279 # Thd old git-svn workflow is deprecated for this script.
280 assert options.vc_interface != "git_svn"
281
282 # Make sure to use git hashes in the new workflows. 279 # Make sure to use git hashes in the new workflows.
283 for revision in options.revisions: 280 for revision in options.revisions:
284 if (IsSvnNumber(revision) or 281 if (IsSvnNumber(revision) or
285 (revision[0:1] == "r" and IsSvnNumber(revision[1:]))): 282 (revision[0:1] == "r" and IsSvnNumber(revision[1:]))):
286 print "Please provide full git hashes of the patches to merge." 283 print "Please provide full git hashes of the patches to merge."
287 print "Got: %s" % revision 284 print "Got: %s" % revision
288 return False 285 return False
289 return True 286 return True
290 287
291 def _Config(self): 288 def _Config(self):
(...skipping 18 matching lines...) Expand all
310 CommitLocal, 307 CommitLocal,
311 UploadStep, 308 UploadStep,
312 CommitRepository, 309 CommitRepository,
313 TagRevision, 310 TagRevision,
314 CleanUp, 311 CleanUp,
315 ] 312 ]
316 313
317 314
318 if __name__ == "__main__": # pragma: no cover 315 if __name__ == "__main__": # pragma: no cover
319 sys.exit(MergeToBranch().Run()) 316 sys.exit(MergeToBranch().Run())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698