gclient flatten: preserve vars in pinned deps

Bug: 570091
Change-Id: I8c450da68fd36d166f8f838c645672fce7c03891
Reviewed-on: https://chromium-review.googlesource.com/610004
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>

gclient.py

@@ -1739,8 +1739,9 @@ class Flattener(object):
           continue
         scm = gclient_scm.CreateSCM(
             dep.parsed_url, self._client.root_dir, dep.name, dep.outbuf)
-        dep._parsed_url = dep._raw_url = dep._url = '%s@%s' % (
+        revinfo = scm.revinfo(self._client._options, [], None)
-            url, scm.revinfo(self._client._options, [], None))
+        dep._parsed_url = dep._url = '%s@%s' % (url, revinfo)
+        dep._raw_url = '%s@%s' % (dep._raw_url, revinfo)
 
     self._deps_string = '\n'.join(
         _GNSettingsToLines(

tests/gclient_smoketest.py

@@ -744,8 +744,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         'deps = {',
         '  # src -> src/repo2 -> foo/bar',
         '  "foo/bar": {',
-        '    "url": "git://127.0.0.1:20000/git/repo_3@%s",' % (
+        '    "url": "/repo_3@%s",' % (self.githash('repo_3', 2)),
-                 self.githash('repo_3', 2)),
         '  },',
         '',
         '  # src',
@@ -769,8 +768,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         '',
         '  # src -> src/repo8',
         '  "src/repo8": {',
-        '    "url": "git://127.0.0.1:20000/git/repo_8@%s",' % (
+        '    "url": "/repo_8@%s",' % (self.githash('repo_8', 1)),
-                 self.githash('repo_8', 1)),
         '  },',
         '',
         '}',