Stop SVNWrapper and GitWrapper from inheriting from scm.SVN and scm.GIT.

gclient.py

Index: gclient.py
diff --git a/gclient.py b/gclient.py
index 4e3dac26d6baf168654699ea97e6e19f154b526e..d56f9a25bfbb8fa55d1c1e152f0b132117abcd0b 100755
--- a/gclient.py
+++ b/gclient.py
@@ -373,10 +373,10 @@ class GClient(object):
       from_dir = os.curdir
     path = os.path.realpath(from_dir)
     while not os.path.exists(os.path.join(path, options.config_filename)):
-      next = os.path.split(path)
-      if not next[1]:
+      split_path = os.path.split(path)
+      if not split_path[1]:
         return None
-      path = next[0]
+      path = split_path[0]
     client = GClient(path, options)
     client._LoadConfig()
     return client
@@ -479,7 +479,7 @@ class GClient(object):
       if self._options.deps_os is not None:
         deps_to_include = self._options.deps_os.split(",")
         if "all" in deps_to_include:
-          deps_to_include = deps_os_choices.values()
+          deps_to_include = list(set(deps_os_choices.itervalues()))

[M-A Ruel, 2010/03/11 15:29:40]

Removes duplicate entries.

       else:
         deps_to_include = [deps_os_choices.get(self._options.platform, "unix")]