From 91ec998598be569b1f167cc8776b58f9540b639a Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 18 Nov 2025 20:05:57 +0100 Subject: [PATCH] manifest_xml, git_superproject: Rename an argument for XmlManifest.ToXml() Rename the groups argument to filter_groups to make it more clear what kind of groups it refers to. Change-Id: I90e6e9aa74a7e3e697705dd4bf8676226055878b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/528461 Reviewed-by: Mike Frysinger Commit-Queue: Peter Kjellerstedt Tested-by: Peter Kjellerstedt Reviewed-by: Gavin Mak --- git_superproject.py | 2 +- manifest_xml.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/git_superproject.py b/git_superproject.py index 2ef6df16c..14ba1547e 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -422,7 +422,7 @@ class Superproject: ) return None manifest_str = self._manifest.ToXml( - groups=self._manifest.GetGroupsStr(), omit_local=True + filter_groups=self._manifest.GetGroupsStr(), omit_local=True ).toxml() manifest_path = self._manifest_path try: diff --git a/manifest_xml.py b/manifest_xml.py index 0e899e5ab..30b806e3c 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -579,16 +579,16 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md peg_rev=False, peg_rev_upstream=True, peg_rev_dest_branch=True, - groups=None, + filter_groups=None, omit_local=False, ): """Return the current manifest XML.""" mp = self.manifestProject - if groups is None: - groups = mp.manifest_groups - if groups: - groups = self._ParseList(groups) + if filter_groups is None: + filter_groups = mp.manifest_groups + if filter_groups: + filter_groups = self._ParseList(filter_groups) doc = xml.dom.minidom.Document() root = doc.createElement("manifest") @@ -661,7 +661,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md output_project(parent, parent_node, project) def output_project(parent, parent_node, p): - if not p.MatchesGroups(groups): + if not p.MatchesGroups(filter_groups): return if omit_local and self.IsFromLocalManifest(p): @@ -732,9 +732,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md le.setAttribute("dest", lf.dest) e.appendChild(le) - egroups = p.groups - {"all", f"name:{p.name}", f"path:{p.relpath}"} - if egroups: - e.setAttribute("groups", ",".join(sorted(egroups))) + groups = p.groups - {"all", f"name:{p.name}", f"path:{p.relpath}"} + if groups: + e.setAttribute("groups", ",".join(sorted(groups))) for a in p.annotations: if a.keep == "true":