| 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 if not self.Confirm("Please check if your local checkout is sane: Inspect " | 355 if not self.Confirm("Please check if your local checkout is sane: Inspect " |
| 356 "%s, compile, run tests. Do you want to commit this new trunk " | 356 "%s, compile, run tests. Do you want to commit this new trunk " |
| 357 "revision to the repository?" % VERSION_FILE): | 357 "revision to the repository?" % VERSION_FILE): |
| 358 self.Die("Execution canceled.") # pragma: no cover | 358 self.Die("Execution canceled.") # pragma: no cover |
| 359 | 359 |
| 360 | 360 |
| 361 class CommitSVN(Step): | 361 class CommitSVN(Step): |
| 362 MESSAGE = "Commit to SVN." | 362 MESSAGE = "Commit to SVN." |
| 363 | 363 |
| 364 def RunStep(self): | 364 def RunStep(self): |
| 365 result = self.vc.Land() | 365 if self._options.svn: |
| 366 self.SVNCommit("trunk", self["commit_title"]) |
| 367 else: |
| 368 self.vc.Land() |
| 366 | 369 |
| 367 | 370 |
| 368 class TagRevision(Step): | 371 class TagRevision(Step): |
| 369 MESSAGE = "Tag the new revision." | 372 MESSAGE = "Tag the new revision." |
| 370 | 373 |
| 371 def RunStep(self): | 374 def RunStep(self): |
| 372 self.vc.Tag( | 375 self.vc.Tag( |
| 373 self["version"], self.vc.RemoteCandidateBranch(), self["commit_title"]) | 376 self["version"], self.vc.RemoteCandidateBranch(), self["commit_title"]) |
| 374 | 377 |
| 375 | 378 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 CommitTrunk, | 448 CommitTrunk, |
| 446 SanityCheck, | 449 SanityCheck, |
| 447 CommitSVN, | 450 CommitSVN, |
| 448 TagRevision, | 451 TagRevision, |
| 449 CleanUp, | 452 CleanUp, |
| 450 ] | 453 ] |
| 451 | 454 |
| 452 | 455 |
| 453 if __name__ == "__main__": # pragma: no cover | 456 if __name__ == "__main__": # pragma: no cover |
| 454 sys.exit(PushToTrunk().Run()) | 457 sys.exit(PushToTrunk().Run()) |
| OLD | NEW |