gclient: Don't include CIPD package name in hierarchy.

It causes flakiness, since the package that is responsible for
printing the dependency is not always the same.

Bug: None
Change-Id: I887d740d6a903cb0d5e6c080b76feab78a54effd
Reviewed-on: https://chromium-review.googlesource.com/1116191Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

gclient.py

@@ -1853,6 +1853,9 @@ class CipdDependency(Dependency):
         self.url, self.root.root_dir, self.name, self.outbuf, out_cb,
         root=self._cipd_root, package=self._cipd_package)
 
+  def hierarchy(self, include_url=False):
+    return self.parent.hierarchy(include_url) + ' -> ' + self._cipd_subdir
+
   def ToLines(self):
     """Return a list of lines representing this in a DEPS file."""
     s = []

tests/gclient_smoketest.py

@@ -1397,7 +1397,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         '    "url": "' + self.git_base + 'repo_14",',
         '  },',
         '',
-        '  # src -> src/another_cipd_dep:package1',
+        '  # src -> src/another_cipd_dep',
         '  "src/another_cipd_dep": {',
         '    "packages": [',
         '      {',
@@ -1412,7 +1412,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         '    "dep_type": "cipd",',
         '  },',
         '',
-        '  # src -> src/cipd_dep:package0',
+        '  # src -> src/cipd_dep',
         '  "src/cipd_dep": {',
         '    "packages": [',
         '      {',