Factor out gcl.GetRepositoryRoot() into scm.SVN.GetCheckoutRoot()

trychange.py

 #!/usr/bin/python
 # Copyright (c) 2009 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.
 """
 
 import datetime
@@ skipping 120 matching lines @@
 class SVN(SCM):
   """Gathers the options and diff for a subversion checkout."""
   def GenerateDiff(self, files, root):
     """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 no root directory is provided, the repository root will be
     used.
     """
     previous_cwd = os.getcwd()
-    if root is None:
-      os.chdir(gcl.GetRepositoryRoot())
-    else:
-      os.chdir(root)
+    os.chdir(root or scm.SVN.GetCheckoutRoot(previous_cwd))
 
     # Directories will return None so filter them out.
     diff = filter(None, [scm.SVN.DiffItem(f) for f in files])
     os.chdir(previous_cwd)
     return "".join(diff)
 
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.change_info.GetFileNames()
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     return self.change_info.GetLocalRoot()
 
   def ProcessOptions(self):
+    checkout_root = None
     if not self.options.diff:
       # Generate the diff with svn and write it to the submit queue path.  The
       # files are relative to the repository root, but we need patches relative
       # to one level up from there (i.e., 'src'), so adjust both the file
       # paths and the root of the diff.
+      # TODO(maruel): Remove this hack.
       source_root = GetSourceRoot()
-      prefix = PathDifference(source_root, gcl.GetRepositoryRoot())
+      checkout_root = scm.SVN.GetCheckoutRoot(os.getcwd())
+      prefix = PathDifference(source_root, checkout_root)
       adjusted_paths = [os.path.join(prefix, x) for x in self.options.files]
       self.options.diff = self.GenerateDiff(adjusted_paths, root=source_root)
       self.change_info = gcl.LoadChangelistInfoForMultiple(self.options.name,
           gcl.GetRepositoryRoot(), True, True)
     if not self.options.email:
-      self.options.email = scm.SVN.GetEmail(gcl.GetRepositoryRoot())
+      checkout_root = checkout_root or scm.SVN.GetCheckoutRoot(os.getcwd())
+      self.options.email = scm.SVN.GetEmail(checkout_root)
 
 
 class GIT(SCM):
   """Gathers the options and diff for a git checkout."""
   def GenerateDiff(self):
     """Get the diff we'll send to the try server. We ignore the files list."""
     branch = upload.RunShell(['git', 'cl', 'upstream']).strip()
     diff = upload.RunShell(['git', 'diff-tree', '-p', '--no-prefix',
                             branch, 'HEAD']).splitlines(True)
     for i in range(len(diff)):
@@ skipping 373 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))