From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- taskcluster/gecko_taskgraph/files_changed.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'taskcluster/gecko_taskgraph/files_changed.py') diff --git a/taskcluster/gecko_taskgraph/files_changed.py b/taskcluster/gecko_taskgraph/files_changed.py index c814df0806..0352fb9d7e 100644 --- a/taskcluster/gecko_taskgraph/files_changed.py +++ b/taskcluster/gecko_taskgraph/files_changed.py @@ -16,7 +16,7 @@ from mozpack.path import match as mozpackmatch from mozversioncontrol import InvalidRepoPath, get_repository_object from gecko_taskgraph import GECKO -from gecko_taskgraph.util.hg import get_json_automationrelevance +from gecko_taskgraph.util.hg import get_json_pushchangedfiles logger = logging.getLogger(__name__) @@ -27,9 +27,8 @@ def get_changed_files(repository, revision): Get the set of files changed in the push headed by the given revision. Responses are cached, so multiple calls with the same arguments are OK. """ - contents = get_json_automationrelevance(repository, revision) try: - changesets = contents["changesets"] + return get_json_pushchangedfiles(repository, revision)["files"] except KeyError: # We shouldn't hit this error in CI. if os.environ.get("MOZ_AUTOMATION"): @@ -39,17 +38,6 @@ def get_changed_files(repository, revision): # version control. return get_locally_changed_files(GECKO) - logger.debug("{} commits influencing task scheduling:".format(len(changesets))) - changed_files = set() - for c in changesets: - desc = "" # Support empty desc - if c["desc"]: - desc = c["desc"].splitlines()[0].encode("ascii", "ignore") - logger.debug(" {cset} {desc}".format(cset=c["node"][0:12], desc=desc)) - changed_files |= set(c["files"]) - - return changed_files - def check(params, file_patterns): """Determine whether any of the files changed in the indicated push to -- cgit v1.2.3