Move parsing of TRYSERVER_* so options.root is not overwritten

trychange.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.
 
 """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 150 matching lines @@
     }
     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 AutomagicalSettings(self):
     """Determines settings based on supported code review and checkout tools.
     """
-    # Try to find gclient or repo root first.
+    self._GclStyleSettings()

[M-A Ruel, 2012/12/13 23:58:06]

I'm pretty sure there was a reason for it to be done in the other order.

But I can't recall.

lgtm, just be prepared to revert in case of tool breakage reports.

[kjellander_chromium, 2012/12/18 08:52:15]

I think it's pretty safe to move it. 
All the code below that was added before the parsing was moved there in
https://codereview.chromium.org/8174009
I guess since no on seems to use TRYSERVER_ROOT this problem was not noticed.


On 2012/12/13 23:58:06, Marc-Antoine Ruel wrote:

+    # Try to find gclient or repo root.
     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):
     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)
@@ skipping 674 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))