| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 302 |
| 303 def _ProcessOptions(self, options): | 303 def _ProcessOptions(self, options): |
| 304 # TODO(machenbach): Add a test that covers revert from bleeding_edge | 304 # TODO(machenbach): Add a test that covers revert from bleeding_edge |
| 305 if len(options.revisions) < 1: | 305 if len(options.revisions) < 1: |
| 306 if not options.patch: | 306 if not options.patch: |
| 307 print "Either a patch file or revision numbers must be specified" | 307 print "Either a patch file or revision numbers must be specified" |
| 308 return False | 308 return False |
| 309 if not options.message: | 309 if not options.message: |
| 310 print "You must specify a merge comment if no patches are specified" | 310 print "You must specify a merge comment if no patches are specified" |
| 311 return False | 311 return False |
| 312 options.bypass_upload_hooks = True |
| 312 return True | 313 return True |
| 313 | 314 |
| 314 def _Steps(self): | 315 def _Steps(self): |
| 315 return [ | 316 return [ |
| 316 Preparation, | 317 Preparation, |
| 317 CreateBranch, | 318 CreateBranch, |
| 318 SearchArchitecturePorts, | 319 SearchArchitecturePorts, |
| 319 FindGitRevisions, | 320 FindGitRevisions, |
| 320 ApplyPatches, | 321 ApplyPatches, |
| 321 PrepareVersion, | 322 PrepareVersion, |
| 322 IncrementVersion, | 323 IncrementVersion, |
| 323 CommitLocal, | 324 CommitLocal, |
| 324 UploadStep, | 325 UploadStep, |
| 325 CommitRepository, | 326 CommitRepository, |
| 326 PrepareSVN, | 327 PrepareSVN, |
| 327 TagRevision, | 328 TagRevision, |
| 328 CleanUp, | 329 CleanUp, |
| 329 ] | 330 ] |
| 330 | 331 |
| 331 | 332 |
| 332 if __name__ == "__main__": # pragma: no cover | 333 if __name__ == "__main__": # pragma: no cover |
| 333 sys.exit(MergeToBranch(CONFIG).Run()) | 334 sys.exit(MergeToBranch(CONFIG).Run()) |
| OLD | NEW |