From 9b72cf2ba5c00bee726aa4bddbb84be554294284 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Tue, 29 Mar 2022 21:54:22 +0000 Subject: project: Isolate ManifestProject from RepoProject Create RepoProject and ManifestProject, inheriting from MetaProject, with methods separated for isolation and clarity. Change-Id: Ic1d6efc65c99470290fea612e2abaf8670d199f4 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/334139 Tested-by: LaMont Jones Reviewed-by: Mike Frysinger --- manifest_xml.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'manifest_xml.py') diff --git a/manifest_xml.py b/manifest_xml.py index a14cc526..d3e952a5 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -25,7 +25,8 @@ import gitc_utils from git_config import GitConfig, IsId from git_refs import R_HEADS, HEAD import platform_utils -from project import Annotation, RemoteSpec, Project, MetaProject +from project import (Annotation, RemoteSpec, Project, RepoProject, + ManifestProject) from error import (ManifestParseError, ManifestInvalidPathError, ManifestInvalidRevisionError) from wrapper import Wrapper @@ -360,7 +361,7 @@ class XmlManifest(object): # multi-tree. self._outer_client = outer_client or self - self.repoProject = MetaProject(self, 'repo', + self.repoProject = RepoProject(self, 'repo', gitdir=os.path.join(repodir, 'repo/.git'), worktree=os.path.join(repodir, 'repo')) @@ -953,9 +954,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md def SubmanifestProject(self, submanifest_path): """Return a manifestProject for a submanifest.""" subdir = self.SubmanifestInfoDir(submanifest_path) - mp = MetaProject(self, 'manifests', - gitdir=os.path.join(subdir, 'manifests.git'), - worktree=os.path.join(subdir, 'manifests')) + mp = ManifestProject(self, 'manifests', + gitdir=os.path.join(subdir, 'manifests.git'), + worktree=os.path.join(subdir, 'manifests')) return mp def GetDefaultGroupsStr(self): -- cgit v1.2.3-54-g00ecf