tools/git-repo.git/tests/test_manifest_xml.py, branch v2.61.1

manifest_xml: prevent extend-project from inheriting local groups

2026-01-15T18:27:32+00:00

When extending a project in a local manifest, the project inherits the `local:` group. This causes the superproject override logic (which omits projects with `local:` groups) to incorrectly exclude the project from the override manifest. This leads to "extend-project element specifies non-existent project" errors during sync reload. Fix this by stripping `local:` groups from extended projects, ensuring they remain visible to superproject overrides while still allowing other inherited groups to persist. Bug: 470374343 Change-Id: I1a057ebffebc11a19dc14dde7cc13b9f18cdd0a3 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/543222 Reviewed-by: Peter Kjellerstedt Reviewed-by: Mike Frysinger Tested-by: Gavin Mak Commit-Queue: Gavin Mak

Rename XmlManifest.GetGroupsStr() to XmlManifest.GetManifestGroupsStr()

2025-12-03T15:57:22+00:00

This makes it more clear what kind of groups it refers to. Change-Id: I47369050d1436efcc77f3a69d5b7c99a536b23bc Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/528462 Tested-by: Peter Kjellerstedt Reviewed-by: Gavin Mak Commit-Queue: Peter Kjellerstedt Reviewed-by: Mike Frysinger

manifest: Propagate revision attribute through multiple levels of include

2025-11-26T10:08:44+00:00

Make sure a revision attribute for an include element is propagated through multiple levels of manifest includes. Change-Id: If37d65b0cd47da673719976598175d0eb6b7cbbe Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/525341 Reviewed-by: Mike Frysinger Tested-by: Peter Kjellerstedt Commit-Queue: Peter Kjellerstedt Reviewed-by: Gavin Mak

manifest, project: Store project groups as sets

2025-11-26T10:08:07+00:00

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 Tested-by: Peter Kjellerstedt Reviewed-by: Mike Frysinger Commit-Queue: Peter Kjellerstedt

project: Use dicts to keep track of copyfiles and linkfiles

2025-11-26T10:07:35+00:00

This avoids copying/linking the same file/link multiple times if a copyfile/linkfile element with the same values has been specifed multiple times. This can happen when including a common manifest that uses an extend-project element that has a copyfile/linkfile element. This uses dicts rather than sets to store the copyfiles and linkfiles to make sure the order they are specified in the manifest is maintained. For Python 3.7+, maintaining the order that keys are added to dicts is guaranteed, and for Python 3.6 it happened to be true. The _CopyFile class and the _LinkFile class are changed to inherit from NamedTuple to be able to store them in dicts. Change-Id: I9f5a80298b875251a81c5fe7d353e262d104fae4 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/525322 Reviewed-by: Mike Frysinger Reviewed-by: Gavin Mak Tested-by: Peter Kjellerstedt Commit-Queue: Peter Kjellerstedt

manifest: Make include groups propagate to extend-project elements

2025-11-26T10:05:48+00:00

Any groups specified to an include element should propagate to any extend-project elements and then on to the projects. Change-Id: I62b95689cc13660858564ae569cbfd095961ecc7 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/525321 Tested-by: Peter Kjellerstedt Commit-Queue: Peter Kjellerstedt Reviewed-by: Gavin Mak Reviewed-by: Mike Frysinger

tests: manifest_xml: convert most path usage to pathlib

2025-11-11T18:58:51+00:00

Should be functionally the same, but with pathlib APIs that we've been slowly adopting in other places, especially unittests. Change-Id: I81364117f8eaeaf138097cdfc484d4848b7ea5bd Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/525881 Tested-by: Mike Frysinger Reviewed-by: Gavin Mak Commit-Queue: Mike Frysinger

manifest: Make extend-project support copyfile, linkfile and annotation

2025-10-27T18:38:07+00:00

This allows an existing project to be extended by these elements. Change-Id: I6826e518f39ca86485301491639101943b7e2ae0 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/519781 Reviewed-by: Mike Frysinger Tested-by: Peter Kjellerstedt Reviewed-by: Gavin Mak

black: update to v25

2025-03-25T18:20:35+00:00

Requires a little reformatting in the tree. Change-Id: Iaa40fe0dfca372c49c04cc26edccb5f7b0c2a8ad Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/462883 Commit-Queue: Mike Frysinger Reviewed-by: Gavin Mak Tested-by: Mike Frysinger

manifest: add optional base check on remove and extend

2024-10-28T16:55:10+00:00

This adds an optional, built-in checker for guarding against patches hanging on wrong base revisions, which is useful if a lower layer of the manifest changes after a patch was done. When adding a patch with a new revision using extend-project or remove-project/project: C---D---E patches in project bla / A---B project bla in manifest state 1 If project bla gets updated, in a new snap ID or by a supplier or similar, to a new state: C---D---E patches in project bla / A---B---F---G project bla in manifest state 2 Parsing will fail because revision of bla is now G, giving the choice to create a new patch branch from G and updating base-rev, or keeping previous branch for some reason and only updating base-rev. Intended for use in a layered manifest with hashed revisions. Named refs like branches and tags also work fine when comparing, but will be misleading if a branch is used as base-rev. Change-Id: Ic6211550a7d3cc9656057f6a2087c505b40cad2b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/436777 Reviewed-by: Josip Sokcevic Tested-by: Fredrik de Groot Commit-Queue: Josip Sokcevic