Reapply r51760 and r51761 that were reverted in r51767.

Add the fix for FileImpl() plus unit tests.

TEST=more tests

Review URL: http://codereview.chromium.org/2808048

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@52005 0039d316-1c4b-4281-b951-d872f2087c98

gclient.py

@@ -49,9 +49,8 @@ Hooks
     ]
 """
 
-__version__ = "0.4.1"
+__version__ = "0.5"
 
-import errno
 import logging
 import optparse
 import os
@@ -97,22 +96,6 @@ class GClientKeywords(object):
       return 'From(%s, %s)' % (repr(self.module_name),
                                repr(self.sub_target_name))
 
-    def GetUrl(self, target_name, sub_deps_base_url, root_dir, sub_deps):
-      """Resolve the URL for this From entry."""
-      sub_deps_target_name = target_name
-      if self.sub_target_name:
-        sub_deps_target_name = self.sub_target_name
-      url = sub_deps[sub_deps_target_name]
-      if url.startswith('/'):
-        # If it's a relative URL, we need to resolve the URL relative to the
-        # sub deps base URL.
-        if not isinstance(sub_deps_base_url, basestring):
-          sub_deps_base_url = sub_deps_base_url.GetPath()
-        scm = gclient_scm.CreateSCM(sub_deps_base_url, root_dir,
-                                    None)
-        url = scm.FullUrlForRelativeUrl(url)
-      return url
-
   class FileImpl(object):
     """Used to implement the File('') syntax which lets you sync a single file
     from a SVN repo."""
@@ -160,6 +143,7 @@ class Dependency(GClientKeywords):
     self.parent = parent
     self.name = name
     self.url = url
+    self.parsed_url = None
     # These 2 are only set in .gclient and not in DEPS files.
     self.safesync_url = safesync_url
     self.custom_vars = custom_vars or {}
@@ -167,12 +151,18 @@ class Dependency(GClientKeywords):
     self.deps_hooks = []
     self.dependencies = []
     self.deps_file = deps_file or self.DEPS_FILE
+    # A cache of the files affected by the current operation, necessary for
+    # hooks.
+    self.file_list = []
     self.deps_parsed = False
     self.direct_reference = False
 
     # Sanity checks
     if not self.name and self.parent:
       raise gclient_utils.Error('Dependency without name')
+    if self.name in [d.name for d in self.tree(False)]:
+      raise gclient_utils.Error('Dependency %s specified more than once' %
+          self.name)
     if not isinstance(self.url,
         (basestring, self.FromImpl, self.FileImpl, None.__class__)):
       raise gclient_utils.Error('dependency url must be either a string, None, '
@@ -182,16 +172,65 @@ class Dependency(GClientKeywords):
       raise gclient_utils.Error('deps_file name must not be a path, just a '
                                 'filename. %s' % self.deps_file)
 
+  def LateOverride(self, url):
+    overriden_url = self.get_custom_deps(self.name, url)
+    if overriden_url != url:
+      self.parsed_url = overriden_url
+      logging.debug('%s, %s was overriden to %s' % (self.name, url,
+          self.parsed_url))
+    elif isinstance(url, self.FromImpl):
+      ref = [dep for dep in self.tree(True) if url.module_name == dep.name]
+      if not len(ref) == 1:
+        raise Exception('Failed to find one reference to %s. %s' % (
+          url.module_name, ref))
+      ref = ref[0]
+      sub_target = url.sub_target_name or url
+      # Make sure the referenced dependency DEPS file is loaded and file the
+      # inner referenced dependency.
+      ref.ParseDepsFile(False)
+      found_dep = None
+      for d in ref.dependencies:
+        if d.name == sub_target:
+          found_dep = d
+          break
+      if not found_dep:
+        raise Exception('Couldn\'t find %s in %s, referenced by %s' % (
+            sub_target, ref.name, self.name))
+      # Call LateOverride() again.
+      self.parsed_url = found_dep.LateOverride(found_dep.url)
+      logging.debug('%s, %s to %s' % (self.name, url, self.parsed_url))
+    elif isinstance(url, basestring):
+      parsed_url = urlparse.urlparse(url)
+      if not parsed_url[0]:
+        # A relative url. Fetch the real base.
+        path = parsed_url[2]
+        if not path.startswith('/'):
+          raise gclient_utils.Error(
+              'relative DEPS entry \'%s\' must begin with a slash' % url)
+        # Create a scm just to query the full url.
+        scm = gclient_scm.CreateSCM(self.parent.parsed_url, self.root_dir(),
+                                    None)
+        self.parsed_url = scm.FullUrlForRelativeUrl(url)
+      else:
+        self.parsed_url = url
+      logging.debug('%s, %s -> %s' % (self.name, url, self.parsed_url))
+    elif isinstance(url, self.FileImpl):
+      self.parsed_url = url
+      logging.debug('%s, %s -> %s (File)' % (self.name, url, self.parsed_url))
+    return self.parsed_url
+
   def ParseDepsFile(self, direct_reference):
     """Parses the DEPS file for this dependency."""
     if direct_reference:
       # Maybe it was referenced earlier by a From() keyword but it's now
       # directly referenced.
       self.direct_reference = direct_reference
+    if self.deps_parsed:
+      return
     self.deps_parsed = True
     filepath = os.path.join(self.root_dir(), self.name, self.deps_file)
     if not os.path.isfile(filepath):
-      return {}
+      return
     deps_content = gclient_utils.FileRead(filepath)
 
     # Eval the content.
@@ -242,110 +281,104 @@ class Dependency(GClientKeywords):
         # dependency local path.
         rel_deps[os.path.normpath(os.path.join(self.name, d))] = url
       deps = rel_deps
-    # TODO(maruel): Add these dependencies into self.dependencies.
-    return deps
-
-  def _ParseAllDeps(self, solution_urls):
-    """Parse the complete list of dependencies for the client.
 
-    Args:
+    # Convert the deps into real Dependency.
-      solution_urls: A dict mapping module names (as relative paths) to URLs
+    for name, url in deps.iteritems():
-        corresponding to the solutions specified by the client.  This parameter
+      if name in [s.name for s in self.dependencies]:
-        is passed as an optimization.
+        raise
-
+      self.dependencies.append(Dependency(self, name, url))
-    Returns:
+    # Sort by name.
-      A dict mapping module names (as relative paths) to URLs corresponding
+    self.dependencies.sort(key=lambda x: x.name)
-      to the entire set of dependencies to checkout for the given client.
+    logging.info('Loaded: %s' % str(self))
-
+
-    Raises:
+  def RunCommandRecursively(self, options, revision_overrides,
-      Error: If a dependency conflicts with another dependency or of a solution.
+                            command, args, pm):
-    """
+    """Runs 'command' before parsing the DEPS in case it's a initial checkout
-    deps = {}
+    or a revert."""
-    for solution in self.dependencies:
+    assert self.file_list == []
-      solution_deps = solution.ParseDepsFile(True)
+    # When running runhooks, there's no need to consult the SCM.
-
+    # All known hooks are expected to run unconditionally regardless of working
-      # If a line is in custom_deps, but not in the solution, we want to append
+    # copy state, so skip the SCM status check.
-      # this line to the solution.
+    run_scm = command not in ('runhooks', None)
-      for d in solution.custom_deps:
+    self.LateOverride(self.url)
-        if d not in solution_deps:
+    if run_scm and self.parsed_url:
-          solution_deps[d] = solution.custom_deps[d]
+      if isinstance(self.parsed_url, self.FileImpl):
-
+        # Special support for single-file checkout.
-      for d in solution_deps:
+        if not command in (None, 'cleanup', 'diff', 'pack', 'status'):
-        if d in solution.custom_deps:
+          options.revision = self.parsed_url.GetRevision()
-          # Dependency is overriden.
+          scm = gclient_scm.SVNWrapper(self.parsed_url.GetPath(),
-          url = solution.custom_deps[d]
+                                       self.root_dir(),
-          if url is None:
+                                       self.name)
-            continue
+          scm.RunCommand('updatesingle', options,
+                         args + [self.parsed_url.GetFilename()],
+                         self.file_list)
       else:
-          url = solution_deps[d]
+        options.revision = revision_overrides.get(self.name)
-          # if we have a From reference dependent on another solution, then
+        scm = gclient_scm.CreateSCM(self.parsed_url, self.root_dir(), self.name)
-          # just skip the From reference. When we pull deps for the solution,
+        scm.RunCommand(command, options, args, self.file_list)
-          # we will take care of this dependency.
+        self.file_list = [os.path.join(self.name, f.strip())
-          #
+                          for f in self.file_list]
-          # If multiple solutions all have the same From reference, then we
+      options.revision = None
-          # should only add one to our list of dependencies.
+    if pm:
-          if isinstance(url, self.FromImpl):
+      # The + 1 comes from the fact that .gclient is considered a step in
-            if url.module_name in solution_urls:
+      # itself, .i.e. this code is called one time for the .gclient. This is not
-              # Already parsed.
+      # conceptually correct but it simplifies code.
-              continue
+      pm._total = len(self.tree(False)) + 1
-            if d in deps and type(deps[d]) != str:
+      pm.update()
-              if url.module_name == deps[d].module_name:
+    if self.recursion_limit():
+      # Then we can parse the DEPS file.
+      self.ParseDepsFile(True)
+      if pm:
+        pm._total = len(self.tree(False)) + 1
+        pm.update(0)
+      # Parse the dependencies of this dependency.
+      for s in self.dependencies:
+        # TODO(maruel): All these can run concurrently! No need for threads,
+        # just buffer stdout&stderr on pipes and flush as they complete.
+        # Watch out for stdin.
+        s.RunCommandRecursively(options, revision_overrides, command, args, pm)
+
+  def RunHooksRecursively(self, options):
+    """Evaluates all hooks, running actions as needed. RunCommandRecursively()
+    must have been called before to load the DEPS."""
+    # If "--force" was specified, run all hooks regardless of what files have
+    # changed.
+    if self.deps_hooks:
+      # TODO(maruel): If the user is using git or git-svn, then we don't know
+      # what files have changed so we always run all hooks. It'd be nice to fix
+      # that.
+      if (options.force or
+          gclient_scm.GetScmName(self.parsed_url) in ('git', None) or
+          os.path.isdir(os.path.join(self.root_dir(), self.name, '.git'))):
+        for hook_dict in self.deps_hooks:
+          self._RunHookAction(hook_dict, [])
+      else:
+        # TODO(phajdan.jr): We should know exactly when the paths are absolute.
+        # Convert all absolute paths to relative.
+        for i in range(len(self.file_list)):
+          # It depends on the command being executed (like runhooks vs sync).
+          if not os.path.isabs(self.file_list[i]):
             continue
-          elif isinstance(url, str):
-            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 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
 
-  def _RunHooks(self, command, file_list, is_using_git):
+          prefix = os.path.commonprefix([self.root_dir().lower(),
-    """Evaluates all hooks, running actions as needed.
+                                        self.file_list[i].lower()])
-    """
+          self.file_list[i] = self.file_list[i][len(prefix):]
-    # Hooks only run for these command types.
-    if not command in ('update', 'revert', 'runhooks'):
-      return
-
-    # Hooks only run when --nohooks is not specified
-    if self._options.nohooks:
-      return
-
-    # Get any hooks from the .gclient file.
-    hooks = self.deps_hooks[:]
-    # Add any hooks found in DEPS files.
-    for d in self.dependencies:
-      hooks.extend(d.deps_hooks)
 
-    # If "--force" was specified, run all hooks regardless of what files have
+          # Strip any leading path separators.
-    # changed.  If the user is using git, then we don't know what files have
+          while (self.file_list[i].startswith('\\') or
-    # changed so we always run all hooks.
+                 self.file_list[i].startswith('/')):
-    if self._options.force or is_using_git:
+            self.file_list[i] = self.file_list[i][1:]
-      for hook_dict in hooks:
-        self._RunHookAction(hook_dict, [])
-      return
 
         # Run hooks on the basis of whether the files from the gclient operation
         # match each hook's pattern.
-    for hook_dict in hooks:
+        for hook_dict in self.deps_hooks:
           pattern = re.compile(hook_dict['pattern'])
-      matching_file_list = [f for f in file_list if pattern.search(f)]
+          matching_file_list = [f for f in self.file_list if pattern.search(f)]
           if matching_file_list:
             self._RunHookAction(hook_dict, matching_file_list)
+    if self.recursion_limit():
+      for s in self.dependencies:
+        s.RunHooksRecursively(options)
 
   def _RunHookAction(self, hook_dict, matching_file_list):
     """Runs the action from a single hook."""
@@ -389,7 +422,7 @@ class Dependency(GClientKeywords):
   def __str__(self):
     out = []
     for i in ('name', 'url', 'safesync_url', 'custom_deps', 'custom_vars',
-              'deps_hooks'):
+              'deps_hooks', 'file_list'):
       # 'deps_file'
       if self.__dict__[i]:
         out.append('%s: %s' % (i, self.__dict__[i]))
@@ -505,19 +538,23 @@ solutions = [
       'safesync_url' : safesync_url,
     })
 
-  def _SaveEntries(self, entries):
+  def _SaveEntries(self):
     """Creates a .gclient_entries file to record the list of unique checkouts.
 
     The .gclient_entries file lives in the same directory as .gclient.
     """
     # Sometimes pprint.pformat will use {', sometimes it'll use { ' ... It
     # makes testing a bit too fun.
-    result = pprint.pformat(entries, 2)
+    result = 'entries = {\n'
-    if result.startswith('{\''):
+    for entry in self.tree(False):
-      result = '{ \'' + result[2:]
+      # Skip over File() dependencies as we can't version them.
-    text = 'entries = \\\n' + result + '\n'
+      if not isinstance(entry.parsed_url, self.FileImpl):
+        result += '  %s: %s,\n' % (pprint.pformat(entry.name),
+            pprint.pformat(entry.parsed_url))
+    result += '}\n'
     file_path = os.path.join(self.root_dir(), self._options.entries_filename)
-    gclient_utils.FileWrite(file_path, text)
+    logging.info(result)
+    gclient_utils.FileWrite(file_path, result)
 
   def _ReadEntries(self):
     """Read the .gclient_entries file for the given client.
@@ -578,115 +615,32 @@ solutions = [
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
     revision_overrides = self._EnforceRevisions()
-
+    pm = None
-    # When running runhooks --force, there's no need to consult the SCM.
-    # All known hooks are expected to run unconditionally regardless of working
-    # copy state, so skip the SCM status check.
-    run_scm = not (command == 'runhooks' and self._options.force)
-
-    entries = {}
-    file_list = []
-    # Run on the base solutions first.
-    for solution in self.dependencies:
-      name = solution.name
-      if name in entries:
-        raise gclient_utils.Error("solution %s specified more than once" % name)
-      url = solution.url
-      entries[name] = url
-      if run_scm and url:
-        self._options.revision = revision_overrides.get(name)
-        scm = gclient_scm.CreateSCM(url, self.root_dir(), name)
-        scm.RunCommand(command, self._options, args, file_list)
-        file_list = [os.path.join(name, f.strip()) for f in file_list]
-        self._options.revision = None
-
-    # Process the dependencies next (sort alphanumerically to ensure that
-    # containing directories get populated first and for readability)
-    deps = self._ParseAllDeps(entries)
-    deps_to_process = deps.keys()
-    deps_to_process.sort()
-
-    # First pass for direct dependencies.
-    if command == 'update' and not self._options.verbose:
-      pm = Progress('Syncing projects', len(deps_to_process))
-    for d in deps_to_process:
-      if command == 'update' and not self._options.verbose:
-        pm.update()
-      if type(deps[d]) == str:
-        url = deps[d]
-        entries[d] = url
-        if run_scm:
-          self._options.revision = revision_overrides.get(d)
-          scm = gclient_scm.CreateSCM(url, self.root_dir(), d)
-          scm.RunCommand(command, self._options, args, file_list)
-          self._options.revision = None
-      elif isinstance(deps[d], self.FileImpl):
-        if command in (None, 'cleanup', 'diff', 'pack', 'status'):
-          continue
-        file_dep = deps[d]
-        self._options.revision = file_dep.GetRevision()
-        if run_scm:
-          scm = gclient_scm.SVNWrapper(file_dep.GetPath(), self.root_dir(), d)
-          scm.RunCommand('updatesingle', self._options,
-                         args + [file_dep.GetFilename()], file_list)
-
     if command == 'update' and not self._options.verbose:
+      pm = Progress('Syncing projects', len(self.tree(False)) + 1)
+    self.RunCommandRecursively(self._options, revision_overrides,
+                               command, args, pm)
+    if pm:
       pm.end()
 
-    # Second pass for inherited deps (via the From keyword)
+    # Once all the dependencies have been processed, it's now safe to run the
-    for d in deps_to_process:
+    # hooks.
-      if isinstance(deps[d], self.FromImpl):
+    if not self._options.nohooks:
-        # Getting the URL from the sub_deps file can involve having to resolve
+      self.RunHooksRecursively(self._options)
-        # a File() or having to resolve a relative URL.  To resolve relative
-        # URLs, we need to pass in the orignal sub deps URL.
-        sub_deps_base_url = deps[deps[d].module_name]
-        sub_deps = Dependency(self, deps[d].module_name, sub_deps_base_url
-            ).ParseDepsFile(False)
-        url = deps[d].GetUrl(d, sub_deps_base_url, self.root_dir(), sub_deps)
-        entries[d] = url
-        if run_scm:
-          self._options.revision = revision_overrides.get(d)
-          scm = gclient_scm.CreateSCM(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
-
-      prefix = os.path.commonprefix([self.root_dir().lower(),
-                                     file_list[i].lower()])
-      file_list[i] = file_list[i][len(prefix):]
-
-      # Strip any leading path separators.
-      while file_list[i].startswith('\\') or file_list[i].startswith('/'):
-        file_list[i] = file_list[i][1:]
-
-    is_using_git = gclient_utils.IsUsingGit(self.root_dir(), entries.keys())
-    self._RunHooks(command, file_list, is_using_git)
 
     if command == 'update':
       # Notify the user if there is an orphaned entry in their working copy.
       # Only delete the directory if there are no changes in it, and
       # delete_unversioned_trees is set to true.
-      prev_entries = self._ReadEntries()
+      entries = [i.name for i in self.tree(False)]
-      for entry in prev_entries:
+      for entry, prev_url in self._ReadEntries().iteritems():
         # Fix path separator on Windows.
         entry_fixed = entry.replace('/', os.path.sep)
         e_dir = os.path.join(self.root_dir(), entry_fixed)
         # Use entry and not entry_fixed there.
         if entry not in entries and os.path.exists(e_dir):
-          modified_files = False
-          if isinstance(prev_entries, list):
-            # old .gclient_entries format was list, now dict
-            modified_files = gclient_scm.scm.SVN.CaptureStatus(e_dir)
-          else:
           file_list = []
-            scm = gclient_scm.CreateSCM(prev_entries[entry], self.root_dir(),
+          scm = gclient_scm.CreateSCM(prev_url, self.root_dir(), entry_fixed)
-                                        entry_fixed)
           scm.status(self._options, [], file_list)
           modified_files = file_list != []
           if not self._options.delete_unversioned_trees or modified_files:
@@ -701,7 +655,7 @@ solutions = [
                 entry_fixed, self.root_dir()))
             gclient_utils.RemoveDirectory(e_dir)
       # record the current list of entries for next time
-      self._SaveEntries(entries)
+      self._SaveEntries()
     return 0
 
   def PrintRevInfo(self):
@@ -717,76 +671,53 @@ solutions = [
     """
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
+    # Load all the settings.
+    self.RunCommandRecursively(self._options, {}, None, [], None)
 
-    # Inner helper to generate base url and rev tuple
     def GetURLAndRev(name, original_url):
+      """Returns the revision-qualified SCM url."""
+      if isinstance(original_url, self.FileImpl):
+        return original_url.file_location
       url, _ = gclient_utils.SplitUrlRevision(original_url)
       scm = gclient_scm.CreateSCM(original_url, self.root_dir(), name)
-      return (url, scm.revinfo(self._options, [], None))
+      if not os.path.isdir(scm.checkout_path):
+        return None
+      return '%s@%s' % (url, scm.revinfo(self._options, [], None))
 
-    # text of the snapshot gclient file
-    new_gclient = ""
-    # Dictionary of { path : SCM url } to ensure no duplicate solutions
-    solution_names = {}
-    entries = {}
-    # Run on the base solutions first.
-    for solution in self.dependencies:
-      # Dictionary of { path : SCM url } to describe the gclient checkout
-      name = solution.name
-      if name in solution_names:
-        raise gclient_utils.Error("solution %s specified more than once" % name)
-      (url, rev) = GetURLAndRev(name, solution.url)
-      entries[name] = "%s@%s" % (url, rev)
-      solution_names[name] = "%s@%s" % (url, rev)
-
-    # Process the dependencies next (sort alphanumerically to ensure that
-    # containing directories get populated first and for readability)
-    deps = self._ParseAllDeps(entries)
-    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, rev) = GetURLAndRev(d, deps[d])
-        entries[d] = "%s@%s" % (url, rev)
-
-    # Second pass for inherited deps (via the From keyword)
-    for d in deps_to_process:
-      if isinstance(deps[d], self.FromImpl):
-        deps_parent_url = entries[deps[d].module_name]
-        if deps_parent_url.find("@") < 0:
-          raise gclient_utils.Error("From %s missing revisioned url" %
-                                        deps[d].module_name)
-        sub_deps_base_url = deps[deps[d].module_name]
-        sub_deps = Dependency(self, deps[d].module_name, sub_deps_base_url
-            ).ParseDepsFile(False)
-        url = deps[d].GetUrl(d, sub_deps_base_url, self.root_dir(), sub_deps)
-        (url, rev) = GetURLAndRev(d, url)
-        entries[d] = "%s@%s" % (url, rev)
-
-    # Build the snapshot configuration string
     if self._options.snapshot:
-      url = entries.pop(name)
+      new_gclient = ''
-      custom_deps = ''.join(['      \"%s\": \"%s\",\n' % (x, entries[x])
+      # First level at .gclient
-                             for x in sorted(entries.keys())])
+      for d in self.dependencies:
-
+        entries = {}
+        def GrabDeps(sol):
+          """Recursively grab dependencies."""
+          for i in sol.dependencies:
+            entries[i.name] = GetURLAndRev(i.name, i.parsed_url)
+            GrabDeps(i)
+        GrabDeps(d)
+        custom_deps = []
+        for k in sorted(entries.keys()):
+          if entries[k]:
+            # Quotes aren't escaped...
+            custom_deps.append('      \"%s\": \'%s\',\n' % (k, entries[k]))
+          else:
+            custom_deps.append('      \"%s\": None,\n' % k)
         new_gclient += self.DEFAULT_SNAPSHOT_SOLUTION_TEXT % {
-                     'solution_name': name,
+            'solution_name': d.name,
-                     'solution_url': url,
+            'solution_url': d.url,
-                     'safesync_url' : '',
+            'safesync_url' : d.safesync_url or '',
-                     'solution_deps': custom_deps,
+            'solution_deps': ''.join(custom_deps),
         }
-    else:
-      print(';\n'.join(['%s: %s' % (x, entries[x])
-                       for x in sorted(entries.keys())]))
-
       # Print the snapshot configuration file
-    if self._options.snapshot:
+      print(self.DEFAULT_SNAPSHOT_FILE_TEXT % {'solution_list': new_gclient})
-      config = self.DEFAULT_SNAPSHOT_FILE_TEXT % {'solution_list': new_gclient}
+    else:
-      snapclient = GClient(self.root_dir(), self._options)
+      entries = sorted(self.tree(False), key=lambda i: i.name)
-      snapclient.SetConfig(config)
+      for entry in entries:
-      print(snapclient.config_content)
+        revision = GetURLAndRev(entry.name, entry.parsed_url)
+        line = '%s: %s' % (entry.name, revision)
+        if not entry is entries[-1]:
+          line += ';'
+        print line
 
   def ParseDepsFile(self, direct_reference):
     """No DEPS to parse for a .gclient file."""
@@ -1107,8 +1038,7 @@ def CMDrevinfo(parser, args):
                          'references')
   parser.add_option('-s', '--snapshot', action='store_true',
                     help='creates a snapshot .gclient file of the current '
-                         'version of all repositories to reproduce the tree, '
+                         'version of all repositories to reproduce the tree')
-                         'implies -a')
   (options, args) = parser.parse_args(args)
   client = GClient.LoadCurrentConfig(options)
   if not client:

gclient_utils.py

@@ -310,14 +310,6 @@ def SubprocessCallAndFilter(command,
     raise Error(msg)
 
 
-def IsUsingGit(root, paths):
-  """Returns True if we're using git to manage any of our checkouts.
-  |entries| is a list of paths to check."""
-  for path in paths:
-    if os.path.exists(os.path.join(root, path, '.git')):
-      return True
-  return False
-
 def FindGclientRoot(from_dir, filename='.gclient'):
   """Tries to find the gclient root."""
   path = os.path.realpath(from_dir)

tests/gclient_smoketest.py

@@ -401,6 +401,7 @@ class GClientSmokeSVN(GClientSmokeBase):
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
     out = ('src: %(base)s/src@2;\n'
+           'src/file/foo: %(base)s/third_party/foo/origin;\n'
            'src/other: %(base)s/other@2;\n'
            'src/third_party/foo: %(base)s/third_party/foo@1\n' %
           { 'base': self.svn_base + 'trunk' })
@@ -575,7 +576,6 @@ class GClientSmokeGIT(GClientSmokeBase):
   def testRevInfo(self):
     if not self.enabled:
       return
-    # TODO(maruel): Test multiple solutions.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
@@ -614,7 +614,7 @@ class GClientSmokeBoth(GClientSmokeBase):
                      # file when File() is used in a DEPS file.
                      ('running', self.root_dir + '/src/file/foo'),
                      'running', 'running', 'running', 'running', 'running',
-                     'running', 'running'])
+                     'running'])
     # TODO(maruel): Something's wrong here. git outputs to stderr 'Switched to
     # new branch \'hash\''.
     #self.checkString('', results[1])
@@ -630,7 +630,6 @@ class GClientSmokeBoth(GClientSmokeBase):
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
-    tree['src/svn_hooked2'] = 'svn_hooked2'
     self.assertTree(tree)
 
   def testMultiSolutionsMultiRev(self):
@@ -673,6 +672,7 @@ class GClientSmokeBoth(GClientSmokeBase):
     results = self.gclient(['revinfo', '--deps', 'mac'])
     out = ('src: %(svn_base)s/src/@2;\n'
            'src-git: %(git_base)srepo_1@%(hash1)s;\n'
+           'src/file/foo: %(svn_base)s/third_party/foo/origin;\n'
            'src/other: %(svn_base)s/other@2;\n'
            'src/repo2: %(git_base)srepo_2@%(hash2)s;\n'
            'src/repo2/repo_renamed: %(git_base)srepo_3@%(hash3)s;\n'

tests/gclient_utils_test.py

@@ -17,7 +17,7 @@ class GclientUtilsUnittest(SuperMoxTestBase):
     members = [
         'CheckCall', 'CheckCallError', 'Error', 'FileRead', 'FileWrite',
         'FindFileUpwards', 'FindGclientRoot', 'GetGClientRootAndEntries',
-        'GetNamedNodeText', 'GetNodeNamedAttributeText', 'IsUsingGit',
+        'GetNamedNodeText', 'GetNodeNamedAttributeText',
         'PathDifference', 'ParseXML', 'PrintableObject', 'RemoveDirectory',
         'SplitUrlRevision', 'SubprocessCall', 'SubprocessCallAndFilter',
         'SyntaxErrorToError',