| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import datetime | 6 import datetime |
| 7 import optparse | 7 import optparse |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import string | 10 import string |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 return default | 483 return default |
| 484 return answer | 484 return answer |
| 485 | 485 |
| 486 | 486 |
| 487 def drover(options, args): | 487 def drover(options, args): |
| 488 revision = options.revert or options.merge | 488 revision = options.revert or options.merge |
| 489 | 489 |
| 490 # Initialize some variables used below. They can be overwritten by | 490 # Initialize some variables used below. They can be overwritten by |
| 491 # the drover.properties file. | 491 # the drover.properties file. |
| 492 BASE_URL = "svn://svn.chromium.org/chrome" | 492 BASE_URL = "svn://svn.chromium.org/chrome" |
| 493 REVERT_ALT_URLS = ['svn://svn.chromium.org/chrome-internal', | 493 REVERT_ALT_URLS = ['svn://svn.chromium.org/blink', |
| 494 'svn://svn.chromium.org/chrome-internal', |
| 494 'svn://svn.chromium.org/native_client'] | 495 'svn://svn.chromium.org/native_client'] |
| 495 TRUNK_URL = BASE_URL + "/trunk/src" | 496 TRUNK_URL = BASE_URL + "/trunk/src" |
| 496 BRANCH_URL = BASE_URL + "/branches/$branch/src" | 497 BRANCH_URL = BASE_URL + "/branches/$branch/src" |
| 497 SKIP_CHECK_WORKING = True | 498 SKIP_CHECK_WORKING = True |
| 498 PROMPT_FOR_AUTHOR = False | 499 PROMPT_FOR_AUTHOR = False |
| 499 | 500 |
| 500 # Translate a given milestone to the appropriate branch number. | 501 # Translate a given milestone to the appropriate branch number. |
| 501 if options.milestone: | 502 if options.milestone: |
| 502 options.branch = getBranchForMilestone(options.milestone) | 503 options.branch = getBranchForMilestone(options.milestone) |
| 503 if not options.branch: | 504 if not options.branch: |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 | 713 |
| 713 if options.branch and options.milestone: | 714 if options.branch and options.milestone: |
| 714 option_parser.error("--branch cannot be used with --milestone") | 715 option_parser.error("--branch cannot be used with --milestone") |
| 715 return 1 | 716 return 1 |
| 716 | 717 |
| 717 return drover(options, args) | 718 return drover(options, args) |
| 718 | 719 |
| 719 | 720 |
| 720 if __name__ == "__main__": | 721 if __name__ == "__main__": |
| 721 sys.exit(main()) | 722 sys.exit(main()) |
| OLD | NEW |