From cd454025b331ae93e83270fcb53db532c6731228 Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Thu, 2 Apr 2020 14:14:24 +0000 Subject: [PATCH] Revert "Reland "git-cl: Execute clang-format-diff.py using vpython."" This reverts commit 87661afbfc1b59fbfb64183379f2aadaac6c84c7. Reason for revert: Still get: OSError: Execution failed with error: [Error 2] The system cannot find the file specified. Original change's description: > Reland "git-cl: Execute clang-format-diff.py using vpython." > > This is a reland of beec66070ea79d5cad14d27927ef1bb2f0f01793 > > Append the clang-format directory to the front of PATH instead of > overwriting it. > This allows vpython to be invoked. > > Original change's description: > > git-cl: Execute clang-format-diff.py using vpython. > > > > When running git-cl using vpython3, sys.executable is python3. > > Execute clang-format-diff.py using vpython instead, since it has > > not been migrated already. > > > > Bug: 1066187 > > Change-Id: I31556acb50ff4256706a313c1393eddad9f903f3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2130926 > > Reviewed-by: Josip Sokcevic > > Commit-Queue: Edward Lesmes > > Bug: 1066187 > Change-Id: I8b65549ef47587cef8492f8f76a037eb85a981fc > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2132972 > Reviewed-by: Josip Sokcevic > Commit-Queue: Edward Lesmes TBR=ehmaldonado@chromium.org,apolito@google.com,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com Change-Id: I22566c829a83991e3749a039d0bd0ba7d8a56812 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1066187 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2133588 Reviewed-by: John Budorick Commit-Queue: John Budorick --- git_cl.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/git_cl.py b/git_cl.py index 204fbc25c..30800918d 100755 --- a/git_cl.py +++ b/git_cl.py @@ -4750,22 +4750,21 @@ def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit): if opts.diff: sys.stdout.write(stdout) else: + env = os.environ.copy() + env['PATH'] = str(os.path.dirname(clang_format_tool)) try: script = clang_format.FindClangFormatScriptInChromiumTree( 'clang-format-diff.py') except clang_format.NotFoundError as e: DieWithError(e) - cmd = ['vpython', script, '-p0'] + cmd = [sys.executable, script, '-p0'] if not opts.dry_run and not opts.diff: cmd.append('-i') diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files) diff_output = RunGit(diff_cmd).encode('utf-8') - env = os.environ.copy() - env['PATH'] = ( - str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH']) stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env) if opts.diff: sys.stdout.write(stdout)