Add repo-managed checkout support to trychange.py

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 78 matching lines @@
   parsing.
   """
   return re.sub(r'[^\w#-]', '_', name)
 
 
 class SCM(object):
   """Simplistic base class to implement one function: ProcessOptions."""
   def __init__(self, options, path, file_list):
     items = path.split('@')
     assert len(items) <= 2
-    self.checkout_root = items[0]
+    self.checkout_root = os.path.abspath(items[0])
     items.append(None)
     self.diff_against = items[1]
     self.options = options
     # Lazy-load file list from the SCM unless files were specified in options.
     self._files = None
     self._file_tuples = None
     if file_list:
       self._files = file_list
       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
+    self.toplevel_root = None
 
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.files
 
   def GetCodeReviewSetting(self, key):
     """Returns a value for the given key for this repository.
 
     Uses gcl-style settings from the repository.
     """
@@ skipping 22 matching lines @@
       'project': self.GetCodeReviewSetting('TRYSERVER_PROJECT'),
       'root': self.GetCodeReviewSetting('TRYSERVER_ROOT'),
       'patchlevel': self.GetCodeReviewSetting('TRYSERVER_PATCHLEVEL'),
     }
     logging.info('\n'.join(['%s: %s' % (k, v)
                             for (k, v) in settings.iteritems() if v]))
     for (k, v) in settings.iteritems():
       if v and getattr(self.options, k) is None:
         setattr(self.options, k, v)
 
-  def _GclientStyleSettings(self):
-    """Find the root, assuming a gclient-style checkout."""
-    if not self.options.no_gclient and not self.options.root:
-      root = self.checkout_root
-      self.gclient_root = gclient_utils.FindGclientRoot(root)
-      if self.gclient_root:
-        logging.info('Found .gclient at %s' % self.gclient_root)
-        self.options.root = gclient_utils.PathDifference(self.gclient_root,
-                                                         root)
-
   def AutomagicalSettings(self):
     """Determines settings based on supported code review and checkout tools.
     """
-    self._GclientStyleSettings()
+    # Try to find gclient or repo root first.
+    if not self.options.no_search:
+      self.toplevel_root = gclient_utils.FindGclientRoot(self.checkout_root)
+      if self.toplevel_root:
+        logging.info('Found .gclient at %s' % self.toplevel_root)
+      else:
+        self.toplevel_root = gclient_utils.FindFileUpwards(
+            os.path.join('..', '.repo'), self.checkout_root)
+        if self.toplevel_root:
+          logging.info('Found .repo dir at %s'
+                       % os.path.dirname(self.toplevel_root))
+
+      if self.toplevel_root and not self.options.root:
+        assert os.path.abspath(self.toplevel_root) == self.toplevel_root
+        self.options.root = gclient_utils.PathDifference(self.toplevel_root,
+                                                         self.checkout_root)
+
     self._GclStyleSettings()
 
   def ReadRootFile(self, filename):
-    if not self.options.root:
-      filepath = os.path.join(self.checkout_root, filename)
-      if os.path.isfile(filepath):
-        logging.info('Found %s at %s' % (filename, self.checkout_root))
-        return gclient_utils.FileRead(filepath)
-      return None
-    cur = os.path.abspath(self.checkout_root)
-    if self.gclient_root:
-      root = os.path.abspath(self.gclient_root)
-    else:
-      root = gclient_utils.FindGclientRoot(cur)
-    if not root:
-      root = cur
+    cur = self.checkout_root
+    root = self.toplevel_root or self.checkout_root
+
     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
 
@@ skipping 392 matching lines @@
                    help="Used as -pN parameter to patch")
   group.add_option("-s", "--sub_rep", action="append", default=[],
                    help="Subcheckout to use in addition. This is mainly "
                         "useful for gclient-style checkouts. In git, checkout "
                         "the branch with changes first. Use @rev or "
                         "@branch to specify the "
                         "revision/branch to diff against. If no @branch is "
                         "given the diff will be against the upstream branch. "
                         "If @branch then the diff is branch..HEAD. "
                         "All edits must be checked in.")
-  group.add_option("--no_gclient", action="store_true",
-                   help="Disable automatic search for gclient checkout.")
+  group.add_option("--no_search", action="store_true",
+                   help=("Disable automatic search for gclient or repo "
+                        "checkout root."))
   group.add_option("-E", "--exclude", action="append",
                    default=['ChangeLog'], metavar='REGEXP',
                    help="Regexp patterns to exclude files. Default: %default")
   group.add_option("--upstream_branch", action="store",
                    help="Specify the upstream branch to diff against in the "
                         "main checkout")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server by HTTP")
   group.add_option("--use_http",
@@ skipping 200 matching lines @@
     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, None, False))