Refactor Manifest to be XmlManifest
We'll soon be supporting two different manifest formats, but we
can't immediately remove support for the current XML one that is
in wide spread use within Android.
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/main.py b/main.py
index 774b903..70ddeff 100755
--- a/main.py
+++ b/main.py
@@ -36,7 +36,7 @@
from error import ManifestInvalidRevisionError
from error import NoSuchProjectError
from error import RepoChangedException
-from manifest import Manifest
+from manifest_xml import XmlManifest
from pager import RunPager
from subcmds import all as all_commands
@@ -97,7 +97,7 @@
sys.exit(1)
cmd.repodir = self.repodir
- cmd.manifest = Manifest(cmd.repodir)
+ cmd.manifest = XmlManifest(cmd.repodir)
Editor.globalConfig = cmd.manifest.globalConfig
if not isinstance(cmd, MirrorSafeCommand) and cmd.manifest.IsMirror:
diff --git a/manifest.py b/manifest_xml.py
similarity index 99%
rename from manifest.py
rename to manifest_xml.py
index e7a5afb..4697653 100644
--- a/manifest.py
+++ b/manifest_xml.py
@@ -32,7 +32,7 @@
remote = None
-class Manifest(object):
+class XmlManifest(object):
"""manages the repo configuration file"""
def __init__(self, repodir):
diff --git a/repo b/repo
index 176c563..1374255 100755
--- a/repo
+++ b/repo
@@ -505,7 +505,7 @@
my_git = os.path.join(my_dir, '.git')
if os.path.isfile(my_main) and os.path.isdir(my_git):
- for name in ['manifest.py',
+ for name in ['git_config.py',
'project.py',
'subcmds']:
if not os.path.exists(os.path.join(my_dir, name)):