Просмотр исходного кода

manifest: Only display XML help on XML manifest

Some of the help text is only related to the XML formatted manifest,
so only display that text if that is the current format.

Signed-off-by: Shawn O. Pearce <sop@google.com>
Shawn O. Pearce 16 лет назад
Родитель
Сommit
050e4fd591
2 измененных файлов с 13 добавлено и 8 удалено
  1. 0 0
      docs/manifest_xml.txt
  2. 13 8
      subcmds/manifest.py

+ 0 - 0
docs/manifest-format.txt → docs/manifest_xml.txt


+ 13 - 8
subcmds/manifest.py

@@ -18,13 +18,22 @@ import sys
 
 
 from command import PagedCommand
 from command import PagedCommand
 
 
+def _doc(name):
+  r = os.path.dirname(__file__)
+  r = os.path.dirname(r)
+  fd = open(os.path.join(r, 'docs', 'manifest_xml.txt'))
+  try:
+    return fd.read()
+  finally:
+    fd.close()
+
 class Manifest(PagedCommand):
 class Manifest(PagedCommand):
   common = False
   common = False
   helpSummary = "Manifest inspection utility"
   helpSummary = "Manifest inspection utility"
   helpUsage = """
   helpUsage = """
 %prog [-o {-|NAME.xml} [-r]]
 %prog [-o {-|NAME.xml} [-r]]
 """
 """
-  _helpDescription = """
+  _xmlHelp = """
 
 
 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_manifest.xml are combined
@@ -35,13 +44,9 @@ in a Git repository for use during future 'repo init' invocations.
 
 
   @property
   @property
   def helpDescription(self):
   def helpDescription(self):
-    help = self._helpDescription + '\n'
-    r = os.path.dirname(__file__)
-    r = os.path.dirname(r)
-    fd = open(os.path.join(r, 'docs', 'manifest-format.txt'))
-    for line in fd:
-      help += line
-    fd.close()
+    help = ''
+    if isinstance(self.manifest, XmlManifest):
+      help += self._xmlHelp + '\n' + _doc('manifest_xml.txt')
     return help
     return help
 
 
   def _Options(self, p):
   def _Options(self, p):