commit abb7a3dfecdfe98b30594219f24c5c3d5e11e990
author Shawn O. Pearce <sop@google.com> Fri Jul 03 16:16:18 2009 -0700
committer Shawn O. Pearce <sop@google.com> Fri Jul 03 20:03:38 2009 -0700
tree eeec9afdd3f3b42101d436d21e1e802b419c5e74
parent cc6c79643e1cafad565424caabe581e7b548bf6f

Allow callers to request a specific type of manifest

If the caller knows exactly what the manifest type must be we
can now ask the loader to directly construct that type, rather
than guessing it from the working directory.

Signed-off-by: Shawn O. Pearce <sop@google.com>

command.py

diff --git a/command.py b/command.py
index 5ca43f2..9e970e8 100644
--- a/command.py
+++ b/command.py
@@ -62,8 +62,10 @@
   def manifest(self):
     return self.GetManifest()
 
-  def GetManifest(self, reparse=False):
-    return manifest_loader.GetManifest(self.repodir, reparse)
+  def GetManifest(self, reparse=False, type=None):
+    return manifest_loader.GetManifest(self.repodir,
+                                       reparse=reparse,
+                                       type=type)
 
   def GetProjects(self, args, missing_ok=False):
     """A list of projects that match the arguments.

manifest_loader.py

diff --git a/manifest_loader.py b/manifest_loader.py
index 85ad3ea..1ce1c1f 100644
--- a/manifest_loader.py
+++ b/manifest_loader.py
@@ -15,13 +15,17 @@
 
 from manifest_xml import XmlManifest
 
-def ParseManifest(repodir):
+def ParseManifest(repodir, type=None):
+  if type:
+    return type(repodir)
   return XmlManifest(repodir)
 
 _manifest = None
 
-def GetManifest(repodir, reparse=False):
+def GetManifest(repodir, reparse=False, type=None):
   global _manifest
-  if _manifest is None or reparse:
-    _manifest = ParseManifest(repodir)
+  if _manifest is None \
+  or reparse \
+  or (type and _manifest.__class__ != type):
+    _manifest = ParseManifest(repodir, type=type)
   return _manifest