repo: Support multiple branches for the same project.
It is often useful to be able to include the same project more than
once, but with different branches and placed in different paths in the
workspace. Add this feature.
This CL adds the concept of an object directory. The object directory
stores objects that can be shared amongst several working trees. For
newly synced repositories, we set up the git repo now to share its
objects with an object repo.
Each worktree for a given repo shares objects, but has an independent
set of references and branches. This ensures that repo only has to
update the objects once; however the references for each worktree are
updated separately. Storing the references separately is needed to
ensure that commits to a branch on one worktree will not change the
HEAD commits of the others.
One nice side effect of sharing objects between different worktrees is
that you can easily cherry-pick changes between the two worktrees
without needing to fetch them.
Bug: Issue 141
Change-Id: I5e2f4e1a7abb56f9d3f310fa6fd0c17019330ecd
diff --git a/manifest_xml.py b/manifest_xml.py
index bdbb1d4..647e89f 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -209,8 +209,9 @@
root.appendChild(doc.createTextNode(''))
def output_projects(parent, parent_node, projects):
- for p in projects:
- output_project(parent, parent_node, self.projects[p])
+ for project_name in projects:
+ for project in self._projects[project_name]:
+ output_project(parent, parent_node, project)
def output_project(parent, parent_node, p):
if not p.MatchesGroups(groups):
@@ -269,13 +270,11 @@
e.setAttribute('sync-s', 'true')
if p.subprojects:
- sort_projects = list(sorted([subp.name for subp in p.subprojects]))
- output_projects(p, e, sort_projects)
+ subprojects = set(subp.name for subp in p.subprojects)
+ output_projects(p, e, list(sorted(subprojects)))
- sort_projects = list(sorted([key for key, value in self.projects.items()
- if not value.parent]))
- sort_projects.sort()
- output_projects(None, root, sort_projects)
+ projects = set(p.name for p in self._paths.values() if not p.parent)
+ output_projects(None, root, list(sorted(projects)))
if self._repo_hooks_project:
root.appendChild(doc.createTextNode(''))
@@ -288,9 +287,14 @@
doc.writexml(fd, '', ' ', '\n', 'UTF-8')
@property
+ def paths(self):
+ self._Load()
+ return self._paths
+
+ @property
def projects(self):
self._Load()
- return self._projects
+ return self._paths.values()
@property
def remotes(self):
@@ -324,6 +328,7 @@
def _Unload(self):
self._loaded = False
self._projects = {}
+ self._paths = {}
self._remotes = {}
self._default = None
self._repo_hooks_project = None
@@ -453,11 +458,17 @@
self._manifest_server = url
def recursively_add_projects(project):
- if self._projects.get(project.name):
+ projects = self._projects.setdefault(project.name, [])
+ if project.relpath is None:
raise ManifestParseError(
- 'duplicate project %s in %s' %
+ 'missing path for %s in %s' %
(project.name, self.manifestFile))
- self._projects[project.name] = project
+ if project.relpath in self._paths:
+ raise ManifestParseError(
+ 'duplicate path %s in %s' %
+ (project.relpath, self.manifestFile))
+ self._paths[project.relpath] = project
+ projects.append(project)
for subproject in project.subprojects:
recursively_add_projects(subproject)
@@ -478,12 +489,18 @@
# Store a reference to the Project.
try:
- self._repo_hooks_project = self._projects[repo_hooks_project]
+ repo_hooks_projects = self._projects[repo_hooks_project]
except KeyError:
raise ManifestParseError(
'project %s not found for repo-hooks' %
(repo_hooks_project))
+ if len(repo_hooks_projects) != 1:
+ raise ManifestParseError(
+ 'internal error parsing repo-hooks in %s' %
+ (self.manifestFile))
+ self._repo_hooks_project = repo_hooks_projects[0]
+
# Store the enabled hooks in the Project object.
self._repo_hooks_project.enabled_repo_hooks = enabled_repo_hooks
if node.nodeName == 'remove-project':
@@ -530,11 +547,12 @@
name = name,
remote = remote.ToRemoteSpec(name),
gitdir = gitdir,
+ objdir = gitdir,
worktree = None,
relpath = None,
revisionExpr = m.revisionExpr,
revisionId = None)
- self._projects[project.name] = project
+ self._projects[project.name] = [project]
def _ParseRemote(self, node):
"""
@@ -694,9 +712,10 @@
groups = [x for x in re.split(r'[,\s]+', groups) if x]
if parent is None:
- relpath, worktree, gitdir = self.GetProjectPaths(name, path)
+ relpath, worktree, gitdir, objdir = self.GetProjectPaths(name, path)
else:
- relpath, worktree, gitdir = self.GetSubprojectPaths(parent, path)
+ relpath, worktree, gitdir, objdir = \
+ self.GetSubprojectPaths(parent, name, path)
default_groups = ['all', 'name:%s' % name, 'path:%s' % relpath]
groups.extend(set(default_groups).difference(groups))
@@ -709,6 +728,7 @@
name = name,
remote = remote.ToRemoteSpec(name),
gitdir = gitdir,
+ objdir = objdir,
worktree = worktree,
relpath = relpath,
revisionExpr = revisionExpr,
@@ -737,10 +757,15 @@
if self.IsMirror:
worktree = None
gitdir = os.path.join(self.topdir, '%s.git' % name)
+ objdir = gitdir
else:
worktree = os.path.join(self.topdir, path).replace('\\', '/')
gitdir = os.path.join(self.repodir, 'projects', '%s.git' % path)
- return relpath, worktree, gitdir
+ objdir = os.path.join(self.repodir, 'project-objects', '%s.git' % name)
+ return relpath, worktree, gitdir, objdir
+
+ def GetProjectsWithName(self, name):
+ return self._projects.get(name, [])
def GetSubprojectName(self, parent, submodule_path):
return os.path.join(parent.name, submodule_path)
@@ -751,14 +776,15 @@
def _UnjoinRelpath(self, parent_relpath, relpath):
return os.path.relpath(relpath, parent_relpath)
- def GetSubprojectPaths(self, parent, path):
+ def GetSubprojectPaths(self, parent, name, path):
relpath = self._JoinRelpath(parent.relpath, path)
gitdir = os.path.join(parent.gitdir, 'subprojects', '%s.git' % path)
+ objdir = os.path.join(parent.gitdir, 'subproject-objects', '%s.git' % name)
if self.IsMirror:
worktree = None
else:
worktree = os.path.join(parent.worktree, path).replace('\\', '/')
- return relpath, worktree, gitdir
+ return relpath, worktree, gitdir, objdir
def _ParseCopyFile(self, project, node):
src = self._reqatt(node, 'src')