Skip to content

Commit 91ec998

Browse files
Peter KjellerstedtLUCI
authored andcommitted
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 <[email protected]> Commit-Queue: Peter Kjellerstedt <[email protected]> Tested-by: Peter Kjellerstedt <[email protected]> Reviewed-by: Gavin Mak <[email protected]>
1 parent 08964a1 commit 91ec998

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

git_superproject.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def _WriteManifestFile(self):
422422
)
423423
return None
424424
manifest_str = self._manifest.ToXml(
425-
groups=self._manifest.GetGroupsStr(), omit_local=True
425+
filter_groups=self._manifest.GetGroupsStr(), omit_local=True
426426
).toxml()
427427
manifest_path = self._manifest_path
428428
try:

manifest_xml.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -579,16 +579,16 @@ def ToXml(
579579
peg_rev=False,
580580
peg_rev_upstream=True,
581581
peg_rev_dest_branch=True,
582-
groups=None,
582+
filter_groups=None,
583583
omit_local=False,
584584
):
585585
"""Return the current manifest XML."""
586586
mp = self.manifestProject
587587

588-
if groups is None:
589-
groups = mp.manifest_groups
590-
if groups:
591-
groups = self._ParseList(groups)
588+
if filter_groups is None:
589+
filter_groups = mp.manifest_groups
590+
if filter_groups:
591+
filter_groups = self._ParseList(filter_groups)
592592

593593
doc = xml.dom.minidom.Document()
594594
root = doc.createElement("manifest")
@@ -661,7 +661,7 @@ def output_projects(parent, parent_node, projects):
661661
output_project(parent, parent_node, project)
662662

663663
def output_project(parent, parent_node, p):
664-
if not p.MatchesGroups(groups):
664+
if not p.MatchesGroups(filter_groups):
665665
return
666666

667667
if omit_local and self.IsFromLocalManifest(p):
@@ -732,9 +732,9 @@ def output_project(parent, parent_node, p):
732732
le.setAttribute("dest", lf.dest)
733733
e.appendChild(le)
734734

735-
egroups = p.groups - {"all", f"name:{p.name}", f"path:{p.relpath}"}
736-
if egroups:
737-
e.setAttribute("groups", ",".join(sorted(egroups)))
735+
groups = p.groups - {"all", f"name:{p.name}", f"path:{p.relpath}"}
736+
if groups:
737+
e.setAttribute("groups", ",".join(sorted(groups)))
738738

739739
for a in p.annotations:
740740
if a.keep == "true":

0 commit comments

Comments
 (0)