Remove --milestone to force engineers to double-check with TPMs for branch number.

drover.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import collections
 import datetime
-import json
 import optparse
 import os
 import re
 import sys
-import urllib2
 import urlparse
 
 import breakpad  # pylint: disable=W0611
 
 import gclient_utils
 import subprocess2
 
 USAGE = """
 WARNING: Please use this tool in an empty directory
 (or at least one that you don't mind clobbering.)
 
 REQUIRES: SVN 1.5+
 NOTE: NO NEED TO CHECKOUT ANYTHING IN ADVANCE OF USING THIS TOOL.
 Valid parameters:
 
 [Merge from trunk to branch]
 --merge <revision> --branch <branch_num>
 Example: %(app)s --merge 12345 --branch 187
 
-[Merge from trunk to milestone]
---merge <revision> --milestone <milestone_num>
-Example: %(app)s --merge 12345 --milestone 16
-
 [Merge from trunk to local copy]
 --merge <revision> --local
 Example: %(app)s --merge 12345 --local
 
 [Merge from branch to branch]
 --merge <revision> --sbranch <branch_num> --branch <branch_num>
 Example: %(app)s --merge 12345 --sbranch 248 --branch 249
 
 [Revert from trunk]
 --revert <revision>
@@ skipping 316 matching lines @@
 
 def getAllFilesInRevision(files_info):
   """Checks for existing files in the revision.
 
   Anything that's A will require special treatment (either a merge or an
   export + add)
   """
   return ['%s/%s' % (f[2], f[3]) for f in files_info]
 
 
-def getBranchForMilestone(milestone):
-  """Queries omahaproxy.appspot.com for the branch number given |milestone|.
-  """
-  OMAHA_PROXY_URL = "https://omahaproxy.appspot.com/all?json=1"
-  try:
-    response = urllib2.urlopen(OMAHA_PROXY_URL)
-  except urllib2.HTTPError, e:
-    print "Failed to query %s: %d" % (OMAHA_PROXY_URL, e.code)
-    return None
-
-  # Response is in the form of:
-  # [{ os: "os_name", versions: [{ channel: "canary", true_branch: "1490" }] }]
-  os_versions = json.load(response)
-
-  branches = collections.defaultdict(list)
-  for os_version in os_versions:
-    for version in os_version['versions']:
-      if not version['true_branch'] or not version['version']:
-        continue
-      branch = version['true_branch']
-      mstone = version['version'].split('.')
-      if not branch[0].isdigit() or mstone[0] != str(milestone):
-        continue
-      branches[branch] += [os_version['os']]
-
-  if not branches:
-    return None
-
-  if len(branches) == 1:
-    return branches.keys()[0]
-
-  choices = ('-(%s): %s' % (b, ', '.join(o)) for b, o in branches.iteritems())
-  print >> sys.stderr, ("\nNot all platforms have same branch number for M%d.\n"
-                        "\nHere's a list of platforms on each branch:\n"
-                        "%s") % (milestone, '\n'.join(choices))
-
-  errors = 0
-  while errors < 3:
-    user_input = raw_input("Which branch? ('q' to cancel) ").strip().lower()
-    if user_input in branches:
-      return user_input
-    if user_input.startswith('q'):
-      break
-    errors += 1
-
-  return None
-
 def getSVNAuthInfo(folder=None):
   """Fetches SVN authorization information in the subversion auth folder and
   returns it as a dictionary of dictionaries."""
   if not folder:
     if sys.platform == 'win32':
       folder = '%%APPDATA%\\Subversion\\auth'
     else:
       folder = '~/.subversion/auth'
   folder = os.path.expandvars(os.path.expanduser(folder))
   svn_simple_folder = os.path.join(folder, 'svn.simple')
@@ skipping 50 matching lines @@
   BASE_URL = "svn://svn.chromium.org/chrome"
   REVERT_ALT_URLS = ['svn://svn.chromium.org/blink',
                      'svn://svn.chromium.org/chrome-internal',
                      'svn://svn.chromium.org/native_client']
   TRUNK_URL = BASE_URL + "/trunk/src"
   BRANCH_URL = BASE_URL + "/branches/$branch/src"
   SKIP_CHECK_WORKING = True
   PROMPT_FOR_AUTHOR = False
   NO_ALT_URLS = options.no_alt_urls
 
-  # Translate a given milestone to the appropriate branch number.
-  if options.milestone:
-    options.branch = getBranchForMilestone(options.milestone)
-    if not options.branch:
-      return 1
-
   DEFAULT_WORKING = "drover_" + str(revision)
   if options.branch:
     DEFAULT_WORKING += ("_" + options.branch)
 
   if not isMinimumSVNVersion(1, 5):
     print "You need to use at least SVN version 1.5.x"
     return 1
 
   # Override the default properties if there is a drover.properties file.
   global file_pattern_
@@ skipping 152 matching lines @@
   else:
     return 0
 
 
 def main():
   option_parser = optparse.OptionParser(usage=USAGE % {"app": sys.argv[0]})
   option_parser.add_option('-m', '--merge', type="int",
                            help='Revision to merge from trunk to branch')
   option_parser.add_option('-b', '--branch',
                            help='Branch to revert or merge from')
-  option_parser.add_option('-M', '--milestone', type="int",
-                           help='Milestone to revert or merge from')
   option_parser.add_option('-l', '--local', action='store_true',
                            help='Local working copy to merge to')
   option_parser.add_option('-s', '--sbranch',
                            help='Source branch for merge')
   option_parser.add_option('-r', '--revert', type="int",
                            help='Revision to revert')
   option_parser.add_option('-w', '--workdir',
                            help='subdir to use for the revert')
   option_parser.add_option('-u', '--url',
                            help='svn url to use for the revert')
   option_parser.add_option('-a', '--auditor',
                            help='overrides the author for reviewer')
   option_parser.add_option('--revertbot', action='store_true',
                            default=False)
   option_parser.add_option('--no-alt-urls', action='store_true',
                            help='Disable heuristics used to determine svn url')
   option_parser.add_option('--revertbot-commit', action='store_true',
                            default=False)
   option_parser.add_option('--revertbot-reviewers')
   options, args = option_parser.parse_args()
 
   if not options.merge and not options.revert:
     option_parser.error("You need at least --merge or --revert")
     return 1
 
-  if options.merge and not (options.branch or options.milestone or
-                            options.local):
-    option_parser.error("--merge requires either --branch "
-                        "or --milestone or --local")
+  if options.merge and not (options.branch or options.local):
+    option_parser.error("--merge requires --branch or --local")
     return 1
 
-  if options.local and (options.revert or options.branch or options.milestone):
-    option_parser.error("--local cannot be used with --revert "
-                        "or --branch or --milestone")
-    return 1
-
-  if options.branch and options.milestone:
-    option_parser.error("--branch cannot be used with --milestone")
+  if options.local and (options.revert or options.branch):
+    option_parser.error("--local cannot be used with --revert or --branch")
     return 1
 
   return drover(options, args)
 
 
 if __name__ == "__main__":
   sys.exit(main())