mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
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>
This commit is contained in:
parent
4b325813fc
commit
4e1fc1013c
@ -396,10 +396,4 @@ these extra projects.
|
|||||||
Manifest files stored in `$TOP_DIR/.repo/local_manifests/*.xml` will
|
Manifest files stored in `$TOP_DIR/.repo/local_manifests/*.xml` will
|
||||||
be loaded in alphabetical order.
|
be loaded in alphabetical order.
|
||||||
|
|
||||||
Additional remotes and projects may also be added through a local
|
The legacy `$TOP_DIR/.repo/local_manifest.xml` path is no longer supported.
|
||||||
manifest, stored in `$TOP_DIR/.repo/local_manifest.xml`. This method
|
|
||||||
is deprecated in favor of using multiple manifest files as mentioned
|
|
||||||
above.
|
|
||||||
|
|
||||||
If `$TOP_DIR/.repo/local_manifest.xml` exists, it will be loaded before
|
|
||||||
any manifest files stored in `$TOP_DIR/.repo/local_manifests/*.xml`.
|
|
||||||
|
@ -192,7 +192,6 @@ class XmlManifest(object):
|
|||||||
self.topdir = os.path.dirname(self.repodir)
|
self.topdir = os.path.dirname(self.repodir)
|
||||||
self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME)
|
self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME)
|
||||||
self.globalConfig = GitConfig.ForUser()
|
self.globalConfig = GitConfig.ForUser()
|
||||||
self.localManifestWarning = False
|
|
||||||
self.isGitcClient = False
|
self.isGitcClient = False
|
||||||
self._load_local_manifests = True
|
self._load_local_manifests = True
|
||||||
|
|
||||||
@ -555,15 +554,12 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
|
|||||||
self.manifestProject.worktree))
|
self.manifestProject.worktree))
|
||||||
|
|
||||||
if self._load_local_manifests:
|
if self._load_local_manifests:
|
||||||
local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
|
if os.path.exists(os.path.join(self.repodir, LOCAL_MANIFEST_NAME)):
|
||||||
if os.path.exists(local):
|
print('error: %s is not supported; put local manifests in `%s`'
|
||||||
if not self.localManifestWarning:
|
'instead' % (LOCAL_MANIFEST_NAME,
|
||||||
self.localManifestWarning = True
|
|
||||||
print('warning: %s is deprecated; put local manifests '
|
|
||||||
'in `%s` instead' % (LOCAL_MANIFEST_NAME,
|
|
||||||
os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
|
os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
|
||||||
file=sys.stderr)
|
file=sys.stderr)
|
||||||
nodes.append(self._ParseManifestXml(local, self.repodir))
|
sys.exit(1)
|
||||||
|
|
||||||
local_dir = os.path.abspath(os.path.join(self.repodir,
|
local_dir = os.path.abspath(os.path.join(self.repodir,
|
||||||
LOCAL_MANIFESTS_DIR_NAME))
|
LOCAL_MANIFESTS_DIR_NAME))
|
||||||
|
@ -30,7 +30,7 @@ class Manifest(PagedCommand):
|
|||||||
_helpDescription = """
|
_helpDescription = """
|
||||||
|
|
||||||
With the -o option, exports the current manifest for inspection.
|
With the -o option, exports the current manifest for inspection.
|
||||||
The manifest and (if present) local_manifest.xml are combined
|
The manifest and (if present) local_manifests/ are combined
|
||||||
together to produce a single manifest file. This file can be stored
|
together to produce a single manifest file. This file can be stored
|
||||||
in a Git repository for use during future 'repo init' invocations.
|
in a Git repository for use during future 'repo init' invocations.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user