Drover: Add --milestone option to merge to a specific milestone.

drover.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 optparse
 import os
 import re
+import string
 import sys
+import urllib2
 
 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 312 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 = "http://omahaproxy.appspot.com"
+  request = urllib2.Request(OMAHA_PROXY_URL)
+  try:
+    response = urllib2.urlopen(request)
+  except urllib2.HTTPError, e:
+    print "Failed to query %s: %d" % (OMAHA_PROXY_URL, e.code)
+    return None
+
+  # Slice the first line since it's column information text.
+  for line in response.readlines()[1:]:

[laforge, 2011/11/09 05:06:12]

This approach is a little dangerous, but will probably work.  The trouble is
that it will fire on the first match it sees (in this case the CF entries).  In
practice, this shouldn't get out of sync w/ Win/Mac/Linux, but it's not 100%
garunteed.

[James Hawkins, 2011/11/10 03:37:36]

There are two separate things we can do here:
* Default to 'win', since that's the platform likely to be right for 'Chrome'
(ChromeFrame is the most likely to diverge from other releases.)
* Provide an option to specify the platform.

I agree that this corner case will likely be extremely rare.

+    # Version data is CSV.
+    parameters = string.split(line, ',')
+
+    # Milestone is the third parameter.
+    full_milestone = parameters[2]

[laforge, 2011/11/09 05:06:12]

It would probably be clearer to call this var version

[James Hawkins, 2011/11/10 03:37:36]

Done.

+
+    # Full milestone is a quad of numbers separated by periods.
+    milestone_str = string.split(full_milestone, '.')[0]
+    if int(milestone_str, 10) != milestone:
+      continue
+
+    # Correct milestone found. Return the branch parameter, which is last.
+    return parameters[len(parameters) - 1]

[laforge, 2011/11/09 05:06:12]

It would be better here to return full_mstone.split('.')[-2].  The trouble w/
the true_branch column is that (using the following example) the real branch for
this line is 932 and not trunk, however this line as written would return the
word trunk.  Similarly the branches like 874_102 are typically one off branches
not meant to be merged to once they've been released once. 

cf,dev,17.0.932.0,17.0.928.0,11/08/11,11/03/11,108826,NA,99314,trunk

[James Hawkins, 2011/11/10 03:37:36]

Done.

+
+  # Milestone not found.
+  print "Milestone provided is invalid"
+  return None
+
 def prompt(question):
   while True:
     print question + " [y|n]:",
     answer = sys.stdin.readline()
     if answer.lower().startswith('n'):
       return False
     elif answer.lower().startswith('y'):
       return True
 
 
 def text_prompt(question, default):
   print question + " [" + default + "]:"
   answer = sys.stdin.readline()
   if answer.strip() == "":
     return default
   return answer
 
 
 def drover(options, args):
   revision = options.revert or options.merge
 
   # Initialize some variables used below. They can be overwritten by
   # the drover.properties file.
   BASE_URL = "svn://svn.chromium.org/chrome"
   TRUNK_URL = BASE_URL + "/trunk/src"
   BRANCH_URL = BASE_URL + "/branches/$branch/src"
   SKIP_CHECK_WORKING = True
   PROMPT_FOR_AUTHOR = False
 
+  # Translate a given milestone to the appropriate branch number.
+  if options.milestone:
+    options.branch = getBranchForMilestone(options.milestone)
+    if options.branch is None:
+      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 116 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('-a', '--auditor',
                            help='overrides the author for reviewer')
   option_parser.add_option('', '--revertbot', action='store_true',
                            default=False)
   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 and not options.local:
+  if (options.merge and not options.branch and not options.milestone and
+      not options.local):
     option_parser.error("--merge requires either --branch or --local")
     return 1
 
-  if options.local and (options.revert or options.branch):
+  if options.local and (options.revert or options.branch or options.milestone):
     option_parser.error("--local cannot be used with --revert or --branch")
     return 1
 
+  if options.branch and options.milestone:
+    option_parser.error("--branch cannot be used with --milestone")
+    return 1
+
   return drover(options, args)
 
 
 if __name__ == "__main__":
   sys.exit(main())