diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2025-11-08 02:36:56 +0100 |
|---|---|---|
| committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2025-11-26 02:08:07 -0800 |
| commit | 75773b8b9d265bc8ef113586be5c3e2d36250983 (patch) | |
| tree | a8525157425c4732962f89cdbd0315a9c9a46dbe /project.py | |
| parent | 412367bfafd9de014cfeb37475e0f97b1f6a2509 (diff) | |
| download | git-repo-75773b8b9d265bc8ef113586be5c3e2d36250983.tar.gz | |
manifest, project: Store project groups as sets
This helps a lot when including common manifests with groups and they
use extend-project.
Change-Id: Ic574e7d6696139d0eb90d9915e8c7048d5e89c07
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/525323
Reviewed-by: Gavin Mak <gavinmak@google.com>
Tested-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Diffstat (limited to 'project.py')
| -rw-r--r-- | project.py | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -554,7 +554,7 @@ class Project: | |||
| 554 | revisionExpr, | 554 | revisionExpr, |
| 555 | revisionId, | 555 | revisionId, |
| 556 | rebase=True, | 556 | rebase=True, |
| 557 | groups=None, | 557 | groups=set(), |
| 558 | sync_c=False, | 558 | sync_c=False, |
| 559 | sync_s=False, | 559 | sync_s=False, |
| 560 | sync_tags=True, | 560 | sync_tags=True, |
| @@ -839,9 +839,9 @@ class Project: | |||
| 839 | """ | 839 | """ |
| 840 | default_groups = self.manifest.default_groups or ["default"] | 840 | default_groups = self.manifest.default_groups or ["default"] |
| 841 | expanded_manifest_groups = manifest_groups or default_groups | 841 | expanded_manifest_groups = manifest_groups or default_groups |
| 842 | expanded_project_groups = ["all"] + (self.groups or []) | 842 | expanded_project_groups = {"all"} | self.groups |
| 843 | if "notdefault" not in expanded_project_groups: | 843 | if "notdefault" not in expanded_project_groups: |
| 844 | expanded_project_groups += ["default"] | 844 | expanded_project_groups |= {"default"} |
| 845 | 845 | ||
| 846 | matched = False | 846 | matched = False |
| 847 | for group in expanded_manifest_groups: | 847 | for group in expanded_manifest_groups: |
