Move git_cl back into depot_tools.

git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import subprocess
 import sys
 import tempfile
 import textwrap
 import urlparse
 import urllib2
 
 try:
   import readline  # pylint: disable=W0611
 except ImportError:
   pass
 
-# TODO(dpranke): don't use relative import.
-import upload  # pylint: disable=W0403
 try:
-  # TODO(dpranke): We wrap this in a try block for a limited form of
-  # backwards-compatibility with older versions of git-cl that weren't
-  # dependent on depot_tools. This version should still work outside of
-  # depot_tools as long as --bypass-hooks is used. We should remove this
-  # once this has baked for a while and things seem safe.
-  depot_tools_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-  sys.path.append(depot_tools_path)
-  import breakpad  # pylint: disable=W0611
+  import simplejson as json  # pylint: disable=F0401
 except ImportError:
-  pass
+  try:
+    import json
+  except ImportError:
+    # Fall back to the packaged version.
+    from third_party import simplejson as json
+
+
+from third_party import upload
+import breakpad  # pylint: disable=W0611
+import presubmit_support
+import scm
+import watchlists
+
+
 
 DEFAULT_SERVER = 'http://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
 def DieWithError(message):
   print >> sys.stderr, message
   sys.exit(1)
 
 
@@ skipping 719 matching lines @@
 def ConvertToInteger(inputval):
   """Convert a string to integer, but returns either an int or None."""
   try:
     return int(inputval)
   except (TypeError, ValueError):
     return None
 
 
 def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt):
   """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
-  import presubmit_support
-  import scm
-  import watchlists
-
   root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip()
   if not root:
     root = '.'
   absroot = os.path.abspath(root)
   if not root:
     raise Exception('Could not get root directory.')
 
   # We use the sha1 of HEAD as a name of this change.
   name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
   files = scm.GIT.CaptureStatus([root], upstream_branch)
@@ skipping 516 matching lines @@
       return 'closed'
     elif status.find('open') != -1 or status == '1':
       return 'open'
     return 'unknown'
   return 'unset'
 
 
 def GetTreeStatusReason():
   """Fetches the tree status from a json url and returns the message
   with the reason for the tree to be opened or closed."""
-  # Don't import it at file level since simplejson is not installed by default
-  # on python 2.5 and it is only used for git-cl tree which isn't often used,
-  # forcing everyone to install simplejson isn't efficient.
-  try:
-    import simplejson as json  # pylint: disable=F0401
-  except ImportError:
-    try:
-      import json
-    except ImportError:
-      print >> sys.stderr, 'Please install simplejson'
-      sys.exit(1)
-
   url = settings.GetTreeStatusUrl()
   json_url = urlparse.urljoin(url, '/current?format=json')
   connection = urllib2.urlopen(json_url)
   status = json.loads(connection.read())
   connection.close()
   return status['message']
 
 
 def CMDtree(parser, args):
   """show the status of the tree"""
@@ skipping 79 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))