Remove gclient-specific hacks from trychange into gcl.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-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.
 
 """Wrapper script around Rietveld's upload.py that groups files into
 changelists."""
 
 import getpass
 import os
 import random
 import re
 import shutil
 import string
 import subprocess
 import sys
 import tempfile
 import upload
 import urllib2
 
 import breakpad
 
 # gcl now depends on gclient.
 from scm import SVN
 import gclient_utils
 
-__version__ = '1.1.2'
+__version__ = '1.1.3'
 
 
 CODEREVIEW_SETTINGS = {
   # Default values.
   "CODE_REVIEW_SERVER": "codereview.chromium.org",
   "CC_LIST": "chromium-reviews@googlegroups.com",
   "VIEW_VC": "http://src.chromium.org/viewvc/chrome?view=rev&revision=",
 }
 
 # globals that store the root of the current repository and the directory where
@@ skipping 813 matching lines @@
 
 def TryChange(change_info, args, swallow_exception):
   """Create a diff file of change_info and send it to the try server."""
   try:
     import trychange
   except ImportError:
     if swallow_exception:
       return
     ErrorExit("You need to install trychange.py to use the try server.")
 
+  def PathDifference(root, subpath):
+    """Returns the difference subpath minus root."""
+    root = os.path.realpath(root)
+    subpath = os.path.realpath(subpath)
+    if not subpath.startswith(root):
+      return None
+    # If the root does not have a trailing \ or /, we add it so the returned
+    # path starts immediately after the seperator regardless of whether it is
+    # provided.
+    root = os.path.join(root, '')
+    return subpath[len(root):]
+
+  # Try to find the gclient root.
+  def FindGclientRootDir(from_dir):
+    path = os.path.realpath(from_dir)
+    while not os.path.exists(os.path.join(path, '.gclient')):
+      next = os.path.split(path)
+      if not next[1]:
+        return None
+      path = next[0]
+    return path
+
+  trychange_args = []
+  gclient_root = FindGclientRootDir(GetRepositoryRoot())
+  if gclient_root:
+    trychange_args.extend(['--root', PathDifference(gclient_root,
+                                                    GetRepositoryRoot())])
   if change_info:
-    trychange_args = ['--name', change_info.name]
+    trychange_args.extend(['--name', change_info.name])
     if change_info.issue:
       trychange_args.extend(["--issue", str(change_info.issue)])
     if change_info.patchset:
       trychange_args.extend(["--patchset", str(change_info.patchset)])
     trychange_args.extend(args)
     trychange.TryChange(trychange_args,

[bradn, 2009/12/20 22:14:54]

Might be more clear if you decide file_list in the condition, put it in a
variable, and then have a single code path for the extend and the call to
TryChange.

                         file_list=change_info.GetFileNames(),
                         swallow_exception=swallow_exception,
                         prog='gcl try')
   else:
-    trychange.TryChange(args,
+    trychange_args.extend(args)
+    trychange.TryChange(trychange_args,
                         file_list=None,
                         swallow_exception=swallow_exception,
                         prog='gcl try')
 
 
 def Commit(change_info, args):
   if not change_info.GetFiles():
     print "Nothing to commit, changelist is empty."
     return
   if not OptionallyDoPresubmitChecks(change_info, True, args):
@@ skipping 356 matching lines @@
       return 0
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())