summaryrefslogtreecommitdiffstats
path: root/manifest_xml.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-09-06 14:42:47 -0400
committerMike Frysinger <vapier@google.com>2020-09-08 17:00:06 +0000
commit4e1fc1013c9203d3f5e7bdfba909d175a522c1f3 (patch)
treed15174fed0c8ad157a4deba18a20d657d11d6b9b /manifest_xml.py
parent4b325813fc0ba3f6525a9bacb4daf78fccccc3f6 (diff)
downloadgit-repo-4e1fc1013c9203d3f5e7bdfba909d175a522c1f3.tar.gz
manifest: drop support for local_manifest.xml
We deprecated this 8 years ago. Time to drop it to simplify the code as it'll help with refactoring in this module to not migrate it. Change-Id: I2deae5496d1f66a4491408fcdc95cd527062f8b6 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/280798 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: Michael Mortensen <mmortensen@google.com>
Diffstat (limited to 'manifest_xml.py')
-rw-r--r--manifest_xml.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index f546045a..f2d04df2 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -192,7 +192,6 @@ class XmlManifest(object):
192 self.topdir = os.path.dirname(self.repodir) 192 self.topdir = os.path.dirname(self.repodir)
193 self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME) 193 self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME)
194 self.globalConfig = GitConfig.ForUser() 194 self.globalConfig = GitConfig.ForUser()
195 self.localManifestWarning = False
196 self.isGitcClient = False 195 self.isGitcClient = False
197 self._load_local_manifests = True 196 self._load_local_manifests = True
198 197
@@ -555,15 +554,12 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
555 self.manifestProject.worktree)) 554 self.manifestProject.worktree))
556 555
557 if self._load_local_manifests: 556 if self._load_local_manifests:
558 local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME) 557 if os.path.exists(os.path.join(self.repodir, LOCAL_MANIFEST_NAME)):
559 if os.path.exists(local): 558 print('error: %s is not supported; put local manifests in `%s`'
560 if not self.localManifestWarning: 559 'instead' % (LOCAL_MANIFEST_NAME,
561 self.localManifestWarning = True 560 os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
562 print('warning: %s is deprecated; put local manifests ' 561 file=sys.stderr)
563 'in `%s` instead' % (LOCAL_MANIFEST_NAME, 562 sys.exit(1)
564 os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
565 file=sys.stderr)
566 nodes.append(self._ParseManifestXml(local, self.repodir))
567 563
568 local_dir = os.path.abspath(os.path.join(self.repodir, 564 local_dir = os.path.abspath(os.path.join(self.repodir,
569 LOCAL_MANIFESTS_DIR_NAME)) 565 LOCAL_MANIFESTS_DIR_NAME))