Revert "Add GCLIENT_DEP_REF env var for recurse command"

This reverts commit 35c62742f9.

Reason for revert: Causing official branch failures: http://shortn/_AGHUiAf5Fu

Original change's description:
> Add GCLIENT_DEP_REF env var for recurse command
>
> The goal of this change is to facilitate analyzing DEPS autorolls https://crrev.com/c/2250928
>
> Change-Id: Icbebd144a85f7e24aa638f93d8c30f3f0aab1e5c
> Bug: 923016
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2239069
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Commit-Queue: Gregory Guterman <guterman@google.com>

TBR=ehmaldonado@chromium.org,guterman@google.com,infra-scoped@luci-project-accounts.iam.gserviceaccount.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 923016
Change-Id: I23ef45c90250441bf02cd956a446c0cf8b0bbcf7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2255567
Auto-Submit: Ben Mason <benmason@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
changes/67/2255567/3
Ben Mason 6 years ago
parent 35c62742f9
commit fbd2c6337c

@ -986,9 +986,6 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
if self.url:
env['GCLIENT_URL'] = str(self.url)
env['GCLIENT_DEP_PATH'] = str(self.name)
parts = self.url.split('@')
if len(parts) > 1:
env['GCLIENT_DEP_REF'] = parts[-1]
if options.prepend_dir and scm == 'git':
print_stdout = False
def filter_fn(line):
@ -1023,13 +1020,9 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
elif os.path.isdir(cwd):
try:
gclient_utils.CheckCallAndFilter(
args,
cwd=cwd,
env=env,
print_stdout=print_stdout,
args, cwd=cwd, env=env, print_stdout=print_stdout,
filter_fn=filter_fn,
shell=True,
)
)
except subprocess2.CalledProcessError:
if not options.ignore:
raise
@ -2048,7 +2041,6 @@ def CMDrecurse(parser, args):
Runs a shell command on all entries.
Sets GCLIENT_DEP_PATH environment variable as the dep's relative location to
root directory of the checkout.
Sets GCLIENT_DEP_REF environment variable as the dep's ref if available
"""
# Stop parsing at the first non-arg so that these go through to the command
parser.disable_interspersed_args()

Loading…
Cancel
Save