From da7a1f902aea36ef992c70d7b8a09d48992aed20 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 10 Aug 2010 17:19:02 +0000
Subject: [PATCH] Fix logic error in LateOverride().

It would modify self.parsed_url even when it's called for a From() keyword

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@55574 0039d316-1c4b-4281-b951-d872f2087c98
---
 gclient.py                 | 38 ++++++++++++++++++++++++++------------
 tests/gclient_smoketest.py |  3 +++
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/gclient.py b/gclient.py
index 9a654c752..7a17e0e8d 100644
--- a/gclient.py
+++ b/gclient.py
@@ -182,11 +182,15 @@ class Dependency(GClientKeywords):
                                 'filename. %s' % self.deps_file)
 
   def LateOverride(self, url):
+    """Resolves the parsed url from url.
+
+    Manages From() keyword accordingly. Do not touch self.parsed_url nor
+    self.url because it may called with other urls due to From()."""
     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))
+          overriden_url))
+      return overriden_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:
@@ -206,8 +210,9 @@ class Dependency(GClientKeywords):
         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))
+      parsed_url = found_dep.LateOverride(found_dep.url)
+      logging.debug('%s, %s to %s' % (self.name, url, parsed_url))
+      return parsed_url
     elif isinstance(url, basestring):
       parsed_url = urlparse.urlparse(url)
       if not parsed_url[0]:
@@ -221,14 +226,19 @@ class Dependency(GClientKeywords):
         if isinstance(parent_url, self.FileImpl):
           parent_url = parent_url.file_location
         scm = gclient_scm.CreateSCM(parent_url, self.root_dir(), None)
-        self.parsed_url = scm.FullUrlForRelativeUrl(url)
+        parsed_url = scm.FullUrlForRelativeUrl(url)
       else:
-        self.parsed_url = url
-      logging.debug('%s, %s -> %s' % (self.name, url, self.parsed_url))
+        parsed_url = url
+      logging.debug('%s, %s -> %s' % (self.name, url, parsed_url))
+      return 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
+      parsed_url = url
+      logging.debug('%s, %s -> %s (File)' % (self.name, url, parsed_url))
+      return parsed_url
+    elif url is None:
+      return None
+    else:
+      raise gclient_utils.Error('Unkown url type')
 
   def ParseDepsFile(self, direct_reference):
     """Parses the DEPS file for this dependency."""
@@ -299,7 +309,11 @@ class Dependency(GClientKeywords):
         raise
       self.dependencies.append(Dependency(self, name, url, None, None, None,
           None))
-    # Sort by name.
+    # Sorting by name would in theory make the whole thing coherent, since
+    # subdirectories will be sorted after the parent directory, but that doens't
+    # work with From() that fetch from a dependency with a name being sorted
+    # later. But if this would be removed right now, many projects wouldn't be
+    # able to sync anymore.
     self.dependencies.sort(key=lambda x: x.name)
     logging.info('Loaded: %s' % str(self))
 
@@ -312,7 +326,7 @@ class Dependency(GClientKeywords):
     # All known hooks are expected to run unconditionally regardless of working
     # copy state, so skip the SCM status check.
     run_scm = command not in ('runhooks', None)
-    self.LateOverride(self.url)
+    self.parsed_url = self.LateOverride(self.url)
     if run_scm and self.parsed_url:
       if isinstance(self.parsed_url, self.FileImpl):
         # Special support for single-file checkout.
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index feaa3158d..d86f67250 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -383,6 +383,9 @@ class GClientSmokeSVN(GClientSmokeBase):
     self.checkString('hi', out[1][1])
     self.assertEquals(4, len(out[0]))
     self.assertEquals(2, len(out[1]))
+    self.assertEquals(1, len(out[2]))
+    self.assertEquals(1, len(out[3]))
+    self.assertEquals(4, len(out))
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.