Move git_cl back into depot_tools.

tests/local_rietveld.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.
 
 """Setups a local Rietveld instance to test against a live server for
 integration tests.
 
 It makes sure Google AppEngine SDK is found, download Rietveld and Django code
 if necessary and starts the server on a free inbound TCP port.
@@ skipping 32 matching lines @@
 class LocalRietveld(object):
   """Downloads everything needed to run a local instance of Rietveld."""
 
   def __init__(self, base_dir=None):
     # Paths
     self.base_dir = base_dir
     if not self.base_dir:
       self.base_dir = os.path.dirname(os.path.abspath(__file__))
       self.base_dir = os.path.realpath(os.path.join(self.base_dir, '..'))
     self.sdk_path = os.path.abspath(
-        os.path.join(self.base_dir, '..', '..', 'google_appengine'))
+        os.path.join(self.base_dir, '..', 'google_appengine'))
     self.dev_app = os.path.join(self.sdk_path, 'dev_appserver.py')
-    self.rietveld = os.path.join(self.base_dir, 'test', 'rietveld')
+    self.rietveld = os.path.join(self.base_dir, 'tests', 'rietveld')
     self.test_server = None
     self.port = None
     # Generate a friendly environment.
     self.env = os.environ.copy()
     self.env['LANGUAGE'] = 'en'
     self.out = None
     self.err = None
 
   def install_prerequisites(self):
     # First, verify the Google AppEngine SDK is available.
@@ skipping 71 matching lines @@
     instance.start_server(verbose=options.verbose)
     print 'Local rietveld instance started on port %d' % instance.port
     while True:
       time.sleep(0.1)
   finally:
     instance.stop_server()
 
 
 if __name__ == '__main__':
   main()