OLD | NEW |
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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 if self._options and self._options.r: | 450 if self._options and self._options.r: |
451 print "Using account %s for review." % self._options.r | 451 print "Using account %s for review." % self._options.r |
452 rev = self._options.r | 452 rev = self._options.r |
453 else: | 453 else: |
454 print "Please enter the email address of a reviewer for the roll CL: ", | 454 print "Please enter the email address of a reviewer for the roll CL: ", |
455 self.DieInForcedMode("A reviewer must be specified in forced mode.") | 455 self.DieInForcedMode("A reviewer must be specified in forced mode.") |
456 rev = self.ReadLine() | 456 rev = self.ReadLine() |
457 args = "commit -am \"Update V8 to version %s.\n\nTBR=%s\"" % (ver, rev) | 457 args = "commit -am \"Update V8 to version %s.\n\nTBR=%s\"" % (ver, rev) |
458 if self.Git(args) is None: | 458 if self.Git(args) is None: |
459 self.Die("'git commit' failed.") | 459 self.Die("'git commit' failed.") |
460 if self.Git("cl upload --send-mail", pipe=False) is None: | 460 force_flag = " -f" if self._options.f else "" |
| 461 if self.Git("cl upload --send-mail%s" % force_flag, pipe=False) is None: |
461 self.Die("'git cl upload' failed, please try again.") | 462 self.Die("'git cl upload' failed, please try again.") |
462 print "CL uploaded." | 463 print "CL uploaded." |
463 | 464 |
464 | 465 |
465 class SwitchV8(Step): | 466 class SwitchV8(Step): |
466 def __init__(self): | 467 def __init__(self): |
467 Step.__init__(self, "Returning to V8 checkout.", requires="chrome_path") | 468 Step.__init__(self, "Returning to V8 checkout.", requires="chrome_path") |
468 | 469 |
469 def RunStep(self): | 470 def RunStep(self): |
470 self.RestoreIfUnset("v8_path") | 471 self.RestoreIfUnset("v8_path") |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 def Main(): | 561 def Main(): |
561 parser = BuildOptions() | 562 parser = BuildOptions() |
562 (options, args) = parser.parse_args() | 563 (options, args) = parser.parse_args() |
563 if not ProcessOptions(options): | 564 if not ProcessOptions(options): |
564 parser.print_help() | 565 parser.print_help() |
565 return 1 | 566 return 1 |
566 RunPushToTrunk(CONFIG, options) | 567 RunPushToTrunk(CONFIG, options) |
567 | 568 |
568 if __name__ == "__main__": | 569 if __name__ == "__main__": |
569 sys.exit(Main()) | 570 sys.exit(Main()) |
OLD | NEW |