Revert "Use a factory method to abstract SCMWrapper creation." totally broke gclient.

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 536 matching lines @@
           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 Error(
                     "relative DEPS entry \"%s\" must begin with a slash" % d)
               # Create a scm just to query the full url.
-              scm = gclient_scm.create_scm(solution["url"], self._root_dir,
+              scm = gclient_scm.SCMWrapper(solution["url"], self._root_dir,
                                            None)
               url = scm.FullUrlForRelativeUrl(url)
         if d in deps and deps[d] != url:
           raise Error(
               "Solutions have conflicting versions of dependency \"%s\"" % d)
         if d in solution_urls and solution_urls[d] != url:
           raise Error(
               "Dependency \"%s\" conflicts with specified solution" % d)
         # Grab the dependency.
         deps[d] = url
@@ skipping 96 matching lines @@
       name = solution["name"]
       deps_file = solution.get("deps_file", self._options.deps_file)
       if '/' in deps_file or '\\' in deps_file:
         raise Error("deps_file name must not be a path, just a filename.")
       if name in entries:
         raise Error("solution %s specified more than once" % name)
       url = solution["url"]
       entries[name] = url
       if run_scm:
         self._options.revision = revision_overrides.get(name)
-        scm = gclient_scm.create_scm(url, self._root_dir, name)
+        scm = gclient_scm.SCMWrapper(url, self._root_dir, name)
         scm.RunCommand(command, self._options, args, file_list)
         file_list = [os.path.join(name, file.strip()) for file in file_list]
         self._options.revision = None
       try:
         deps_content = FileRead(os.path.join(self._root_dir, name,
                                              deps_file))
       except IOError, e:
         if e.errno != errno.ENOENT:
           raise
         deps_content = ""
       entries_deps_content[name] = deps_content
 
     # Process the dependencies next (sort alphanumerically to ensure that
     # containing directories get populated first and for readability)
     deps = self._ParseAllDeps(entries, entries_deps_content)
     deps_to_process = deps.keys()
     deps_to_process.sort()
 
     # First pass for direct dependencies.
     for d in deps_to_process:
       if type(deps[d]) == str:
         url = deps[d]
         entries[d] = url
         if run_scm:
           self._options.revision = revision_overrides.get(d)
-          scm = gclient_scm.create_scm(url, self._root_dir, d)
+          scm = gclient_scm.SCMWrapper(url, self._root_dir, d)
           scm.RunCommand(command, self._options, args, file_list)
           self._options.revision = None
 
     # Second pass for inherited deps (via the From keyword)
     for d in deps_to_process:
       if type(deps[d]) != str:
         sub_deps = self._ParseSolutionDeps(
                            deps[d].module_name,
                            FileRead(os.path.join(self._root_dir,
                                                  deps[d].module_name,
                                                  self._options.deps_file)),
                            {})
         url = sub_deps[d]
         entries[d] = url
         if run_scm:
           self._options.revision = revision_overrides.get(d)
-          scm = gclient_scm.create_scm(url, self._root_dir, d)
+          scm = gclient_scm.SCMWrapper(url, self._root_dir, d)
           scm.RunCommand(command, self._options, args, file_list)
           self._options.revision = None
 
     # Convert all absolute paths to relative.
     for i in range(len(file_list)):
       # TODO(phajdan.jr): We should know exactly when the paths are absolute.
       # It depends on the command being executed (like runhooks vs sync).
       if not os.path.isabs(file_list[i]):
         continue
 
@@ skipping 451 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: