gclient: implement a less hacky relative URL implementation

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 500 matching lines @@
       Error: If a dependency conflicts with another dependency or of a solution.
     """
     deps = {}
     for solution in self.GetVar("solutions"):
       custom_vars = solution.get("custom_vars", {})
       solution_deps = self._ParseSolutionDeps(
                               solution["name"],
                               solution_deps_content[solution["name"]],
                               custom_vars)
 
+      local_scope = {}

[M-A Ruel, 2009/12/15 18:49:42]

I would have preferred to have this code moved into a function so it doesn't
duplicate line 441.

[Mandeep Singh Baines, 2009/12/15 20:54:30]

Good idea. I'll send out a CL to do this.

+      var = self._VarImpl(custom_vars, local_scope)
+      global_scope = {"From": self.FromImpl, "Var": var.Lookup, "deps_os": {}}
+      exec(solution_deps_content[solution["name"]], global_scope, local_scope)
+
       # If a line is in custom_deps, but not in the solution, we want to append
       # this line to the solution.
       if "custom_deps" in solution:
         for d in solution["custom_deps"]:
           if d not in solution_deps:
             solution_deps[d] = solution["custom_deps"][d]
 
       for d in solution_deps:
         if "custom_deps" in solution and d in solution["custom_deps"]:
           # Dependency is overriden.
@@ skipping 17 matching lines @@
                 continue
           else:
             parsed_url = urlparse.urlparse(url)
             scheme = parsed_url[0]
             if not scheme:
               # A relative url. Fetch the real base.
               path = parsed_url[2]
               if path[0] != "/":
                 raise gclient_utils.Error(
                     "relative DEPS entry \"%s\" must begin with a slash" % d)
-              # Create a scm just to query the full url.
-              scm = gclient_scm.CreateSCM(solution["url"], self._root_dir,
-                                           None)
-              url = scm.FullUrlForRelativeUrl(url)
+              if local_scope.get('use_relative_urls2'):
+                 url = gclient_utils.FullUrlFromRelative2(solution["url"], url)
+              else:
+                 url = gclient_utils.FullUrlFromRelative(solution["url"], url)
         if d in deps and deps[d] != url:
           raise gclient_utils.Error(
               "Solutions have conflicting versions of dependency \"%s\"" % d)
         if d in solution_urls and solution_urls[d] != url:
           raise gclient_utils.Error(
               "Dependency \"%s\" conflicts with specified solution" % d)
         # Grab the dependency.
         deps[d] = url
     return deps
 
@@ skipping 611 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: