Update roll_angle.py to work on Windows.

tools/roll_angle.py

 #!/usr/bin/env python
 # Copyright 2015 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 argparse
 import collections
 import logging
 import os
 import re
@@ skipping 14 matching lines @@
 upload.verbosity = 0  # Errors only.
 
 CHROMIUM_GIT_URL = 'https://chromium.googlesource.com/chromium/src.git'
 CL_ISSUE_RE = re.compile('^Issue number: ([0-9]+) \((.*)\)$')
 RIETVELD_URL_RE = re.compile('^https?://(.*)/(.*)')
 ROLL_BRANCH_NAME = 'special_angle_roll_branch'
 TRYJOB_STATUS_SLEEP_SECONDS = 30
 
 # Use a shell for subcommands on Windows to get a PATH search.
 USE_SHELL = sys.platform.startswith('win')
-ANGLE_PATH = 'third_party/angle'
+ANGLE_PATH = os.path.join('third_party', 'angle')
 
 CommitInfo = collections.namedtuple('CommitInfo', ['git_commit',
                                                    'git_repo_url'])
 CLInfo = collections.namedtuple('CLInfo', ['issue', 'url', 'rietveld_server'])
 
+def _PosixPath(path):
+  """Convert a possibly-Windows path to a posix-style path."""
+  (_, path) = os.path.splitdrive(path)
+  return path.replace(os.sep, '/')
 
 def _ParseGitCommitHash(description):
   for line in description.splitlines():
     if line.startswith('commit '):
       return line.split()[1]
   logging.error('Failed to parse git commit id from:\n%s\n', description)
   sys.exit(-1)
   return None
 
 
 def _ParseDepsFile(filename):
   with open(filename, 'rb') as f:
     deps_content = f.read()
   return _ParseDepsDict(deps_content)
 
 
 def _ParseDepsDict(deps_content):
   local_scope = {}
   var = GClientKeywords.VarImpl({}, local_scope)
   global_scope = {
     'File': GClientKeywords.FileImpl,
     'From': GClientKeywords.FromImpl,
     'Var': var.Lookup,
     'deps_os': {},
   }
   exec(deps_content, global_scope, local_scope)
   return local_scope
 
 
-def _GenerateCLDescription(angle_current, angle_new):
-  delim = ''
-  angle_str = ''
+def _GenerateCLDescriptionCommand(angle_current, angle_new, bugs):
   def GetChangeString(current_hash, new_hash):
     return '%s..%s' % (current_hash[0:7], new_hash[0:7]);
 
   def GetChangeLogURL(git_repo_url, change_string):
     return '%s/+log/%s' % (git_repo_url, change_string)
 
+  def GetBugString(bugs):
+    bug_str = 'BUG='
+    for bug in bugs:
+      bug_str += str(bug) + ','
+    return bug_str.rstrip(',')
+
   if angle_current.git_commit != angle_new.git_commit:
     change_str = GetChangeString(angle_current.git_commit,
                                  angle_new.git_commit)
     changelog_url = GetChangeLogURL(angle_current.git_repo_url,
                                     change_str)
 
-  description = 'Roll ANGLE ' + change_str + '\n\n'
-  description += '%s\n\n' % changelog_url
-  description += 'BUG=\nTEST=bots\n'
-  return description
+  return [
+    '-m', 'Roll ANGLE ' + change_str,
+    '-m', '%s' % changelog_url,
+    '-m', GetBugString(bugs),
+    '-m', 'TEST=bots',
+  ]
 
 
 class AutoRoller(object):
   def __init__(self, chromium_src):
     self._chromium_src = chromium_src
 
   def _RunCommand(self, command, working_dir=None, ignore_exit_code=False,
                   extra_env=None):
     """Runs a command and returns the stdout from that command.
 
@@ skipping 21 matching lines @@
   def _GetCommitInfo(self, path_below_src, git_hash=None, git_repo_url=None):
     working_dir = os.path.join(self._chromium_src, path_below_src)
     self._RunCommand(['git', 'fetch', 'origin'], working_dir=working_dir)
     revision_range = git_hash or 'origin'
     ret = self._RunCommand(
         ['git', '--no-pager', 'log', revision_range, '--pretty=full', '-1'],
         working_dir=working_dir)
     return CommitInfo(_ParseGitCommitHash(ret), git_repo_url)
 
   def _GetDepsCommitInfo(self, deps_dict, path_below_src):
-    entry = deps_dict['deps']['src/%s' % path_below_src]
+    entry = deps_dict['deps'][_PosixPath('src/%s' % path_below_src)]
     at_index = entry.find('@')
     git_repo_url = entry[:at_index]
     git_hash = entry[at_index + 1:]
     return self._GetCommitInfo(path_below_src, git_hash, git_repo_url)
 
   def _GetCLInfo(self):
     cl_output = self._RunCommand(['git', 'cl', 'issue'])
     m = CL_ISSUE_RE.match(cl_output.strip())
     if not m:
       logging.error('Cannot find any CL info. Output was:\n%s', cl_output)
@@ skipping 15 matching lines @@
 
   def _IsTreeClean(self):
     lines = self._RunCommand(
       ['git', 'status', '--porcelain', '-uno']).splitlines()
     if len(lines) == 0:
       return True
 
     logging.debug('Dirty/unversioned files:\n%s', '\n'.join(lines))
     return False
 
+  def _GetBugList(self, path_below_src, angle_current, angle_new):
+    working_dir = os.path.join(self._chromium_src, path_below_src)
+    lines = self._RunCommand(
+        ['git','log',
+            '%s..%s' % (angle_current.git_commit, angle_new.git_commit)],
+        working_dir=working_dir).split('\n')
+    bugs = set()
+    for line in lines:
+      line = line.strip()
+      bug_prefix = 'BUG='
+      if line.startswith(bug_prefix):
+        bugs_strings = line[len(bug_prefix):].split(',')
+        for bug_string in bugs_strings:
+          try:
+            bugs.add(int(bug_string))
+          except:
+            # skip this, it may be a project specific bug such as
+            # "angleproejct:X" or an ill-formed BUG= message

[Ken Russell (switch to Gerrit), 2015/06/09 20:53:24]

typo: angleproejct -> angleproject

+            pass
+    return bugs
+
   def _UpdateReadmeFile(self, readme_path, new_revision):
     readme = open(os.path.join(self._chromium_src, readme_path), 'r+')
     txt = readme.read()
     m = re.sub(re.compile('.*^Revision\: ([0-9]*).*', re.MULTILINE),
         ('Revision: %s' % new_revision), txt)
     readme.seek(0)
     readme.write(m)
     readme.truncate()
 
   def PrepareRoll(self, ignore_checks):
@@ skipping 20 matching lines @@
     # Modify Chromium's DEPS file.
 
     # Parse current hashes.
     deps_filename = os.path.join(self._chromium_src, 'DEPS')
     deps = _ParseDepsFile(deps_filename)
     angle_current = self._GetDepsCommitInfo(deps, ANGLE_PATH)
 
     # Find ToT revisions.
     angle_latest = self._GetCommitInfo(ANGLE_PATH)
 
+    # Make sure the roll script doesn't use windows line endings
+    self._RunCommand(['git', 'config', 'core.autocrlf', 'true'])
+
     self._UpdateDep(deps_filename, ANGLE_PATH, angle_latest)
 
     if self._IsTreeClean():
       logging.debug('Tree is clean - no changes detected.')
       self._DeleteRollBranch()
     else:
-      description = _GenerateCLDescription(angle_current, angle_latest)
+      bugs = self._GetBugList(ANGLE_PATH, angle_current, angle_latest)
+      description = _GenerateCLDescriptionCommand(
+          angle_current, angle_latest, bugs)
       logging.debug('Committing changes locally.')
       self._RunCommand(['git', 'add', '--update', '.'])
-      self._RunCommand(['git', 'commit', '-m', description])
+      self._RunCommand(['git', 'commit'] + description)
       logging.debug('Uploading changes...')
-      self._RunCommand(['git', 'cl', 'upload', '-m', description],
+      self._RunCommand(['git', 'cl', 'upload'],
                        extra_env={'EDITOR': 'true'})
+      self._RunCommand(['git', 'cl', 'try'])
       cl_info = self._GetCLInfo()
       print 'Issue: %d URL: %s' % (cl_info.issue, cl_info.url)
 
     # Checkout master again.
     self._RunCommand(['git', 'checkout', 'master'])
     print 'Roll branch left as ' + ROLL_BRANCH_NAME
     return 0
 
   def _UpdateDep(self, deps_filename, dep_relative_to_src, commit_info):
-    dep_name = os.path.join('src', dep_relative_to_src)
+    dep_name = _PosixPath(os.path.join('src', dep_relative_to_src))
 
     # roll_dep_svn.py relies on cwd being the Chromium checkout, so let's
     # temporarily change the working directory and then change back.
     cwd = os.getcwd()
     os.chdir(os.path.dirname(deps_filename))
     roll_dep_svn.update_deps(deps_filename, dep_relative_to_src, dep_name,
                              commit_info.git_commit, '')
     os.chdir(cwd)
 
   def _DeleteRollBranch(self):
@@ skipping 30 matching lines @@
       print 'Aborting pending roll.'
       self._RunCommand(['git', 'checkout', ROLL_BRANCH_NAME])
       # Ignore an error here in case an issue wasn't created for some reason.
       self._RunCommand(['git', 'cl', 'set_close'], ignore_exit_code=True)
       self._RunCommand(['git', 'checkout', active_branch])
       self._RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME])
     return 0
 
 
 def main():
-  if sys.platform in ('win32', 'cygwin'):
-    logging.error('Only Linux and Mac platforms are supported right now.')
-    return -1
-
   parser = argparse.ArgumentParser(
       description='Auto-generates a CL containing an ANGLE roll.')
   parser.add_argument('--abort',
     help=('Aborts a previously prepared roll. '
           'Closes any associated issues and deletes the roll branches'),
     action='store_true')
   parser.add_argument('--ignore-checks', action='store_true', default=False,
       help=('Skips checks for being on the master branch, dirty workspaces and '
             'the updating of the checkout. Will still delete and create local '
             'Git branches.'))
   parser.add_argument('-v', '--verbose', action='store_true', default=False,
       help='Be extra verbose in printing of log messages.')
   args = parser.parse_args()
 
   if args.verbose:
     logging.basicConfig(level=logging.DEBUG)
   else:
     logging.basicConfig(level=logging.ERROR)
 
   autoroller = AutoRoller(SRC_DIR)
   if args.abort:
     return autoroller.Abort()
   else:
     return autoroller.PrepareRoll(args.ignore_checks)
 
 if __name__ == '__main__':
   sys.exit(main())