From 9371979628a945a1caf526aeff84a1ac68a22efe Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 17 Mar 2015 11:29:58 -0700 Subject: Revert "Implementation of manifest defined githooks" This reverts commit 38e4387f8eb8cffd6359d726c38a7c524fef07e3. A "repo init" followed by "repo sync" is meant to be as safe as "git clone". In particular it should not run arbitrary code provided by the manifest owner. It would still be nice to have support for manifest-defined git hooks --- they'd just need a prompt like the upload RepoHook has. Hopefully a later change can bring them back. Change-Id: I5ecd90fb5c2ed64f103d856d1ffcba38a47b062d Signed-off-by: Jonathan Nieder --- manifest_xml.py | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'manifest_xml.py') diff --git a/manifest_xml.py b/manifest_xml.py index 9472a08f..890c954d 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -64,9 +64,7 @@ class _XmlRemote(object): fetch=None, manifestUrl=None, review=None, - revision=None, - projecthookName=None, - projecthookRevision=None): + revision=None): self.name = name self.fetchUrl = fetch self.manifestUrl = manifestUrl @@ -74,8 +72,6 @@ class _XmlRemote(object): self.reviewUrl = review self.revision = revision self.resolvedFetchUrl = self._resolveFetchUrl() - self.projecthookName = projecthookName - self.projecthookRevision = projecthookRevision def __eq__(self, other): return self.__dict__ == other.__dict__ @@ -171,11 +167,6 @@ class XmlManifest(object): e.setAttribute('review', r.reviewUrl) if r.revision is not None: e.setAttribute('revision', r.revision) - if r.projecthookName is not None: - ph = doc.createElement('projecthook') - ph.setAttribute('name', r.projecthookName) - ph.setAttribute('revision', r.projecthookRevision) - e.appendChild(ph) def _ParseGroups(self, groups): return [x for x in re.split(r'[,\s]+', groups) if x] @@ -638,13 +629,7 @@ class XmlManifest(object): if revision == '': revision = None manifestUrl = self.manifestProject.config.GetString('remote.origin.url') - projecthookName = None - projecthookRevision = None - for n in node.childNodes: - if n.nodeName == 'projecthook': - projecthookName, projecthookRevision = self._ParseProjectHooks(n) - break - return _XmlRemote(name, alias, fetch, manifestUrl, review, revision, projecthookName, projecthookRevision) + return _XmlRemote(name, alias, fetch, manifestUrl, review, revision) def _ParseDefault(self, node): """ @@ -948,8 +933,3 @@ class XmlManifest(object): diff['added'].append(toProjects[proj]) return diff - - def _ParseProjectHooks(self, node): - name = self._reqatt(node, 'name') - revision = self._reqatt(node, 'revision') - return name, revision -- cgit v1.2.3-54-g00ecf