diff options
Diffstat (limited to 'manifest_xml.py')
-rw-r--r-- | manifest_xml.py | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index e951bbf5..2be717e2 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
@@ -140,12 +140,12 @@ class XmlManifest(object): | |||
140 | self._load_local_manifests = True | 140 | self._load_local_manifests = True |
141 | 141 | ||
142 | self.repoProject = MetaProject(self, 'repo', | 142 | self.repoProject = MetaProject(self, 'repo', |
143 | gitdir = os.path.join(repodir, 'repo/.git'), | 143 | gitdir=os.path.join(repodir, 'repo/.git'), |
144 | worktree = os.path.join(repodir, 'repo')) | 144 | worktree=os.path.join(repodir, 'repo')) |
145 | 145 | ||
146 | self.manifestProject = MetaProject(self, 'manifests', | 146 | self.manifestProject = MetaProject(self, 'manifests', |
147 | gitdir = os.path.join(repodir, 'manifests.git'), | 147 | gitdir=os.path.join(repodir, 'manifests.git'), |
148 | worktree = os.path.join(repodir, 'manifests')) | 148 | worktree=os.path.join(repodir, 'manifests')) |
149 | 149 | ||
150 | self._Unload() | 150 | self._Unload() |
151 | 151 | ||
@@ -682,15 +682,15 @@ class XmlManifest(object): | |||
682 | if name not in self._projects: | 682 | if name not in self._projects: |
683 | m.PreSync() | 683 | m.PreSync() |
684 | gitdir = os.path.join(self.topdir, '%s.git' % name) | 684 | gitdir = os.path.join(self.topdir, '%s.git' % name) |
685 | project = Project(manifest = self, | 685 | project = Project(manifest=self, |
686 | name = name, | 686 | name=name, |
687 | remote = remote.ToRemoteSpec(name), | 687 | remote=remote.ToRemoteSpec(name), |
688 | gitdir = gitdir, | 688 | gitdir=gitdir, |
689 | objdir = gitdir, | 689 | objdir=gitdir, |
690 | worktree = None, | 690 | worktree=None, |
691 | relpath = name or None, | 691 | relpath=name or None, |
692 | revisionExpr = m.revisionExpr, | 692 | revisionExpr=m.revisionExpr, |
693 | revisionId = None) | 693 | revisionId=None) |
694 | self._projects[project.name] = [project] | 694 | self._projects[project.name] = [project] |
695 | self._paths[project.relpath] = project | 695 | self._paths[project.relpath] = project |
696 | 696 | ||
@@ -798,7 +798,7 @@ class XmlManifest(object): | |||
798 | def _UnjoinName(self, parent_name, name): | 798 | def _UnjoinName(self, parent_name, name): |
799 | return os.path.relpath(name, parent_name) | 799 | return os.path.relpath(name, parent_name) |
800 | 800 | ||
801 | def _ParseProject(self, node, parent = None, **extra_proj_attrs): | 801 | def _ParseProject(self, node, parent=None, **extra_proj_attrs): |
802 | """ | 802 | """ |
803 | reads a <project> element from the manifest file | 803 | reads a <project> element from the manifest file |
804 | """ | 804 | """ |
@@ -883,24 +883,24 @@ class XmlManifest(object): | |||
883 | if node.getAttribute('force-path').lower() in ("yes", "true", "1"): | 883 | if node.getAttribute('force-path').lower() in ("yes", "true", "1"): |
884 | gitdir = os.path.join(self.topdir, '%s.git' % path) | 884 | gitdir = os.path.join(self.topdir, '%s.git' % path) |
885 | 885 | ||
886 | project = Project(manifest = self, | 886 | project = Project(manifest=self, |
887 | name = name, | 887 | name=name, |
888 | remote = remote.ToRemoteSpec(name), | 888 | remote=remote.ToRemoteSpec(name), |
889 | gitdir = gitdir, | 889 | gitdir=gitdir, |
890 | objdir = objdir, | 890 | objdir=objdir, |
891 | worktree = worktree, | 891 | worktree=worktree, |
892 | relpath = relpath, | 892 | relpath=relpath, |
893 | revisionExpr = revisionExpr, | 893 | revisionExpr=revisionExpr, |
894 | revisionId = None, | 894 | revisionId=None, |
895 | rebase = rebase, | 895 | rebase=rebase, |
896 | groups = groups, | 896 | groups=groups, |
897 | sync_c = sync_c, | 897 | sync_c=sync_c, |
898 | sync_s = sync_s, | 898 | sync_s=sync_s, |
899 | sync_tags = sync_tags, | 899 | sync_tags=sync_tags, |
900 | clone_depth = clone_depth, | 900 | clone_depth=clone_depth, |
901 | upstream = upstream, | 901 | upstream=upstream, |
902 | parent = parent, | 902 | parent=parent, |
903 | dest_branch = dest_branch, | 903 | dest_branch=dest_branch, |
904 | **extra_proj_attrs) | 904 | **extra_proj_attrs) |
905 | 905 | ||
906 | for n in node.childNodes: | 906 | for n in node.childNodes: |
@@ -911,7 +911,7 @@ class XmlManifest(object): | |||
911 | if n.nodeName == 'annotation': | 911 | if n.nodeName == 'annotation': |
912 | self._ParseAnnotation(project, n) | 912 | self._ParseAnnotation(project, n) |
913 | if n.nodeName == 'project': | 913 | if n.nodeName == 'project': |
914 | project.subprojects.append(self._ParseProject(n, parent = project)) | 914 | project.subprojects.append(self._ParseProject(n, parent=project)) |
915 | 915 | ||
916 | return project | 916 | return project |
917 | 917 | ||
@@ -1125,7 +1125,7 @@ class GitcManifest(XmlManifest): | |||
1125 | gitc_client_name) | 1125 | gitc_client_name) |
1126 | self.manifestFile = os.path.join(self.gitc_client_dir, '.manifest') | 1126 | self.manifestFile = os.path.join(self.gitc_client_dir, '.manifest') |
1127 | 1127 | ||
1128 | def _ParseProject(self, node, parent = None): | 1128 | def _ParseProject(self, node, parent=None): |
1129 | """Override _ParseProject and add support for GITC specific attributes.""" | 1129 | """Override _ParseProject and add support for GITC specific attributes.""" |
1130 | return super(GitcManifest, self)._ParseProject( | 1130 | return super(GitcManifest, self)._ParseProject( |
1131 | node, parent=parent, old_revision=node.getAttribute('old-revision')) | 1131 | node, parent=parent, old_revision=node.getAttribute('old-revision')) |