| OLD | NEW |
| 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 def _ProcessOptions(self, options): | 286 def _ProcessOptions(self, options): |
| 287 # TODO(machenbach): Add a test that covers revert from bleeding_edge | 287 # TODO(machenbach): Add a test that covers revert from bleeding_edge |
| 288 if len(options.revisions) < 1: | 288 if len(options.revisions) < 1: |
| 289 if not options.patch: | 289 if not options.patch: |
| 290 print "Either a patch file or revision numbers must be specified" | 290 print "Either a patch file or revision numbers must be specified" |
| 291 return False | 291 return False |
| 292 if not options.message: | 292 if not options.message: |
| 293 print "You must specify a merge comment if no patches are specified" | 293 print "You must specify a merge comment if no patches are specified" |
| 294 return False | 294 return False |
| 295 options.bypass_upload_hooks = True | 295 options.bypass_upload_hooks = True |
| 296 # CC ulan to make sure that fixes are merged to Google3. |
| 297 options.cc = "ulan@chromium.org" |
| 296 return True | 298 return True |
| 297 | 299 |
| 298 def _Config(self): | 300 def _Config(self): |
| 299 return { | 301 return { |
| 300 "BRANCHNAME": "prepare-merge", | 302 "BRANCHNAME": "prepare-merge", |
| 301 "PERSISTFILE_BASENAME": "/tmp/v8-merge-to-branch-tempfile", | 303 "PERSISTFILE_BASENAME": "/tmp/v8-merge-to-branch-tempfile", |
| 302 "ALREADY_MERGING_SENTINEL_FILE": | 304 "ALREADY_MERGING_SENTINEL_FILE": |
| 303 "/tmp/v8-merge-to-branch-tempfile-already-merging", | 305 "/tmp/v8-merge-to-branch-tempfile-already-merging", |
| 304 "TEMPORARY_PATCH_FILE": "/tmp/v8-prepare-merge-tempfile-temporary-patch", | 306 "TEMPORARY_PATCH_FILE": "/tmp/v8-prepare-merge-tempfile-temporary-patch", |
| 305 "COMMITMSG_FILE": "/tmp/v8-prepare-merge-tempfile-commitmsg", | 307 "COMMITMSG_FILE": "/tmp/v8-prepare-merge-tempfile-commitmsg", |
| (...skipping 12 matching lines...) Expand all Loading... |
| 318 UploadStep, | 320 UploadStep, |
| 319 CommitRepository, | 321 CommitRepository, |
| 320 PrepareSVN, | 322 PrepareSVN, |
| 321 TagRevision, | 323 TagRevision, |
| 322 CleanUp, | 324 CleanUp, |
| 323 ] | 325 ] |
| 324 | 326 |
| 325 | 327 |
| 326 if __name__ == "__main__": # pragma: no cover | 328 if __name__ == "__main__": # pragma: no cover |
| 327 sys.exit(MergeToBranch().Run()) | 329 sys.exit(MergeToBranch().Run()) |
| OLD | NEW |