gclient: Remove URLs from hierarchy.
Bug: 839925
Change-Id: I66d0bd074433288e780e1bdde9ebfce4fa85db0f
Reviewed-on: https://chromium-review.googlesource.com/1067496
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/gclient.py b/gclient.py
index 9ede7da..56c408f 100755
--- a/gclient.py
+++ b/gclient.py
@@ -438,7 +438,7 @@
condition_part = ([' "condition": %r,' % self.condition]
if self.condition else [])
s.extend([
- ' # %s' % self.hierarchy(include_url=False),
+ ' # %s' % self.hierarchy(),
' "%s": {' % (self.name,),
' "url": "%s",' % (self.raw_url,),
] + condition_part + [
@@ -1120,16 +1120,12 @@
def __repr__(self):
return '%s: %s' % (self.name, self.url)
- def hierarchy(self, include_url=True):
+ def hierarchy(self):
"""Returns a human-readable hierarchical reference to a Dependency."""
- def format_name(d):
- if include_url:
- return '%s(%s)' % (d.name, d.url)
- return d.name
- out = format_name(self)
+ out = self.name
i = self.parent
while i and i.name:
- out = '%s -> %s' % (format_name(i), out)
+ out = '%s -> %s' % (i.name, out)
i = i.parent
return out
@@ -1820,7 +1816,7 @@
condition_part = ([' "condition": %r,' % self.condition]
if self.condition else [])
s.extend([
- ' # %s' % self.hierarchy(include_url=False),
+ ' # %s' % self.hierarchy(),
' "%s": {' % (self.name.split(':')[0],),
' "packages": [',
])
@@ -2018,7 +2014,7 @@
# Only include vars explicitly listed in the DEPS files or gclient solution,
# not automatic, local overrides (i.e. not all of dep.get_vars()).
- hierarchy = dep.hierarchy(include_url=False)
+ hierarchy = dep.hierarchy()
for key, value in dep._vars.iteritems():
# Make sure there are no conflicting variables. It is fine however
# to use same variable name, as long as the value is consistent.
@@ -2132,7 +2128,7 @@
condition_part = ([' "condition": %r,' % dep.condition]
if dep.condition else [])
s.extend([
- ' # %s' % dep.hierarchy(include_url=False),
+ ' # %s' % dep.hierarchy(),
' "%s": {' % (name,),
' "url": "%s",' % (dep.raw_url,),
] + condition_part + [
@@ -2151,7 +2147,7 @@
s = ['%s = [' % name]
for dep, hook in hooks:
s.extend([
- ' # %s' % dep.hierarchy(include_url=False),
+ ' # %s' % dep.hierarchy(),
' {',
])
if hook.name is not None:
@@ -2180,7 +2176,7 @@
s.append(' "%s": [' % hook_os)
for dep, hook in os_hooks:
s.extend([
- ' # %s' % dep.hierarchy(include_url=False),
+ ' # %s' % dep.hierarchy(),
' {',
])
if hook.name is not None: