Support for |change| argument to |GetPreferredTrySlaves()|, try 2.

trychange.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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
@@ skipping 82 matching lines @@
 
 class SCM(object):
   """Simplistic base class to implement one function: ProcessOptions."""
   def __init__(self, options, path):
     items = path.split('@')
     assert len(items) <= 2
     self.checkout_root = items[0]
     items.append(None)
     self.diff_against = items[1]
     self.options = options
-    self.files = self.options.files
+    # Lazy-load file list from the SCM unless files were specified in options.
+    self._files = None
+    self._file_tuples = None
+    if self.options.files:
+      self._files = self.options.files
+      self._file_tuples = [('M', f) for f in self.files]
     self.options.files = None
     self.codereview_settings = None
     self.codereview_settings_file = 'codereview.settings'
     self.gclient_root = None
 
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.files
 
   def GetCodeReviewSetting(self, key):
@@ skipping 66 matching lines @@
     assert cur.startswith(root), (root, cur)
     while cur.startswith(root):
       filepath = os.path.join(cur, filename)
       if os.path.isfile(filepath):
         logging.info('Found %s at %s' % (filename, cur))
         return gclient_utils.FileRead(filepath)
       cur = os.path.dirname(cur)
     logging.warning('Didn\'t find %s' % filename)
     return None
 
+  def _SetFileTuples(self, file_tuples):
+    excluded = ['!', '?', 'X', ' ', '~']
+    def Excluded(f):
+      if f[0][0] in excluded:
+        return True
+      for r in self.options.exclude:
+        if re.search(r, f[1]):
+          logging.info('Ignoring "%s"' % f[1])
+          return True
+      return False
+
+    self._file_tuples = [f for f in file_tuples if not Excluded(f)]
+    self._files = [f[1] for f in self._file_tuples]
+
+  def CaptureStatus(self):
+    """Returns the 'svn status' emulated output as an array of (status, file)
+       tuples."""
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+  @property
+  def files(self):
+    if self._files is None:
+      self._SetFileTuples(self.CaptureStatus())
+    return self._files
+
+  @property
+  def file_tuples(self):
+    if self._file_tuples is None:
+      self._SetFileTuples(self.CaptureStatus())
+    return self._file_tuples
+
 
 class SVN(SCM):
   """Gathers the options and diff for a subversion checkout."""
   def __init__(self, *args, **kwargs):
     SCM.__init__(self, *args, **kwargs)
     self.checkout_root = scm.SVN.GetCheckoutRoot(self.checkout_root)
     if not self.options.email:
       # Assumes the svn credential is an email address.
       self.options.email = scm.SVN.GetEmail(self.checkout_root)
     logging.info("SVN(%s)" % self.checkout_root)
 
   def ReadRootFile(self, filename):
     data = SCM.ReadRootFile(self, filename)
     if data:
       return data
 
     # Try to search on the subversion repository for the file.
     if not gcl:
       return None
     data = gcl.GetCachedFile(filename)
     logging.debug('%s:\n%s' % (filename, data))
     return data
 
+  def CaptureStatus(self):
+    previous_cwd = os.getcwd()
+    os.chdir(self.checkout_root)
+    result = scm.SVN.CaptureStatus(self.checkout_root)
+    os.chdir(previous_cwd)
+    return result
+
   def GenerateDiff(self):
     """Returns a string containing the diff for the given file list.
 
     The files in the list should either be absolute paths or relative to the
     given root.
     """
-    if not self.files:
-      previous_cwd = os.getcwd()
-      os.chdir(self.checkout_root)
-
-      excluded = ['!', '?', 'X', ' ', '~']
-      def Excluded(f):
-        if f[0][0] in excluded:
-          return True
-        for r in self.options.exclude:
-          if re.search(r, f[1]):
-            logging.info('Ignoring "%s"' % f[1])
-            return True
-        return False
-
-      self.files = [f[1] for f in scm.SVN.CaptureStatus(self.checkout_root)
-                    if not Excluded(f)]
-      os.chdir(previous_cwd)
     return scm.SVN.GenerateDiff(self.files, self.checkout_root, full_move=True,
                                 revision=self.diff_against)
 
 
 class GIT(SCM):
   """Gathers the options and diff for a git checkout."""
   def __init__(self, *args, **kwargs):
     SCM.__init__(self, *args, **kwargs)
     self.checkout_root = scm.GIT.GetCheckoutRoot(self.checkout_root)
     if not self.options.name:
       self.options.name = scm.GIT.GetPatchName(self.checkout_root)
     if not self.options.email:
       self.options.email = scm.GIT.GetEmail(self.checkout_root)
     if not self.diff_against:
       self.diff_against = scm.GIT.GetUpstreamBranch(self.checkout_root)
       if not self.diff_against:
         raise NoTryServerAccess(
             "Unable to determine default branch to diff against. "
             "Verify this branch is set up to track another"
             "(via the --track argument to \"git checkout -b ...\"")
     logging.info("GIT(%s)" % self.checkout_root)
 
+  def CaptureStatus(self):
+    return scm.GIT.CaptureStatus(self.checkout_root, self.diff_against)
+
   def GenerateDiff(self):
-    if not self.files:
-      self.files = scm.GIT.GetDifferentFiles(self.checkout_root,
-                                             branch=self.diff_against)
-
-    def NotExcluded(f):
-      for r in self.options.exclude:
-        if re.search(r, f):
-          logging.info('Ignoring "%s"' % f)
-          return False
-      return True
-
-    self.files = filter(NotExcluded, self.files)
     return scm.GIT.GenerateDiff(self.checkout_root, files=self.files,
                                 full_move=True,
                                 branch=self.diff_against)
 
 
 def _ParseSendChangeOptions(options):
   """Parse common options passed to _SendChangeHTTP and _SendChangeSVN."""
   values = {}
   if options.email:
     values['email'] = options.email
@@ skipping 168 matching lines @@
       # ENOENT == 2 = they don't have git installed.
       # 128 = git error code when not in a repo.
       logging.warning('Unexpected error code: %s' % e.returncode)
       raise
   raise NoTryServerAccess("Could not guess version control system. "
                           "Are you in a working copy directory?")
 
 
 def GetMungedDiff(path_diff, diff):
   # Munge paths to match svn.
+  changed_files = []
   for i in range(len(diff)):
     if diff[i].startswith('--- ') or diff[i].startswith('+++ '):
       new_file = posixpath.join(path_diff, diff[i][4:]).replace('\\', '/')
+      changed_files.append(('M', new_file.split('\t')[0]))
       diff[i] = diff[i][0:4] + new_file
-  return diff
+  return (diff, changed_files)
 
 
 def TryChange(argv,
+              change,
               file_list,

[M-A Ruel, 2011/09/30 15:38:44]

I just realized this was an error. TryChange should accept one of change or
file_list, not both. So in that case, file_list should be removed entirely. This
is confusing otherwise.

               swallow_exception,
               prog=None,
               extra_epilog=None):
   """
   Args:
     argv: Arguments and options.
     file_list: Default value to pass to --file.
     swallow_exception: Whether we raise or swallow exceptions.
   """
   # Parse argv
@@ skipping 161 matching lines @@
     if not '://' in options.rietveld_url:
       options.rietveld_url = 'http://' + options.rietveld_url
     match = re.match(r'^(.*)/(\d+)/?$', options.rietveld_url)
     if match:
       if options.issue or options.patchset:
         parser.error('Cannot use both --issue and use a review number url')
       options.issue = int(match.group(2))
       options.rietveld_url = match.group(1)
 
   try:
+    changed_files = None
     # Always include os.getcwd() in the checkout settings.
     checkouts = []
     path = os.getcwd()
     if options.upstream_branch:
       path += '@' + options.upstream_branch
     checkouts.append(GuessVCS(options, path))
     checkouts[0].AutomagicalSettings()
     for item in options.sub_rep:
       checkout = GuessVCS(options, os.path.join(checkouts[0].checkout_root,
                                                 item))
@@ skipping 23 matching lines @@
       # When patchset is specified, it's because it's done by gcl/git-try.
       if json is None:
         parser.error('json or simplejson library is missing, please install.')
       api_url = '%s/api/%d' % (options.rietveld_url, options.issue)
       logging.debug(api_url)
       contents = json.loads(urllib.urlopen(api_url).read())
       options.patchset = contents['patchsets'][-1]
       diff_url = ('%s/download/issue%d_%d.diff' %
           (options.rietveld_url,  options.issue, options.patchset))
       diff = GetMungedDiff('', urllib.urlopen(diff_url).readlines())
-      options.diff = ''.join(diff)
+      options.diff = ''.join(diff[0])
+      changed_files = diff[1]
     else:
       # Use this as the base.
       root = checkouts[0].checkout_root
       diffs = []
       for checkout in checkouts:
         diff = checkout.GenerateDiff().splitlines(True)
         path_diff = gclient_utils.PathDifference(root, checkout.checkout_root)
         # Munge it.
-        diffs.extend(GetMungedDiff(path_diff, diff))
+        diffs.extend(GetMungedDiff(path_diff, diff)[0])
       options.diff = ''.join(diffs)
 
+    if not options.name:
+      if options.issue:
+        options.name = 'Issue %s' % options.issue
+      else:
+        options.name = 'Unnamed'
+        print('Note: use --name NAME to change the try job name.')
+
+    if not options.email:
+      parser.error('Using an anonymous checkout. Please use --email or set '
+                   'the TRYBOT_RESULTS_EMAIL_ADDRESS environment variable.')
+    print('Results will be emailed to: ' + options.email)
+
     if not options.bot:
       # Get try slaves from PRESUBMIT.py files if not specified.
       # Even if the diff comes from options.url, use the local checkout for bot
       # selection.
       try:
         import presubmit_support
         root_presubmit = checkouts[0].ReadRootFile('PRESUBMIT.py')
+        if not change:
+          if not changed_files:
+            changed_files = checkouts[0].file_tuples
+          change = presubmit_support.Change(options.name,
+                                            '',
+                                            checkouts[0].checkout_root,
+                                            changed_files,
+                                            options.issue,
+                                            options.patchset,
+                                            options.email)
         options.bot = presubmit_support.DoGetTrySlaves(
+            change,
             checkouts[0].GetFileNames(),
             checkouts[0].checkout_root,
             root_presubmit,
             options.project,
             False,
             sys.stdout)
       except ImportError:
         pass
       # If no bot is specified, either the default pool will be selected or the
       # try server will refuse the job. Either case we don't need to interfere.
 
-    if options.name is None:
-      if options.issue:
-        options.name = 'Issue %s' % options.issue
-      else:
-        options.name = 'Unnamed'
-        print('Note: use --name NAME to change the try job name.')
-    if not options.email:
-      parser.error('Using an anonymous checkout. Please use --email or set '
-                   'the TRYBOT_RESULTS_EMAIL_ADDRESS environment variable.')
-    else:
-      print('Results will be emailed to: ' + options.email)
-
     # Prevent rietveld updates if we aren't running all the tests.
     if options.testfilter is not None:
       options.issue = None
       options.patchset = None
 
     # Send the patch.
     if options.send_patch:
       # If forced.
       options.send_patch(options)
       PrintSuccess(options)
@@ skipping 15 matching lines @@
     print >> sys.stderr, e
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
-  sys.exit(TryChange(None, [], False))
+  sys.exit(TryChange(None, None, [], False))