avkonst 11 lat temu
rodzic
commit
f9bc010165

+ 2 - 2
mainline/tests/general/test_basic/test_help_--help_default_stdout.gold.txt

@@ -1,5 +1,5 @@
-Usage: D:\Projects\Metrix++\metrixpp.py <action> --help
-   or: D:\Projects\Metrix++\metrixpp.py <action> [options] -- [path 1] ... [path N]
+Usage: C:\Projects\Metrix++\mainline\metrixpp.py <action> --help
+   or: C:\Projects\Metrix++\mainline\metrixpp.py <action> [options] -- [path 1] ... [path N]
 where: actions are:
 	collect
 	debug

+ 2 - 11
mainline/tests/general/test_basic/test_help_export_default_stdout.gold.txt

@@ -18,14 +18,5 @@ Options:
                         processing tools use it in order to recognise/evaluate
                         change trends. [default: none].
   --format=FORMAT, --ft=FORMAT
-                        Format of the output data. Possible values are 'xml',
-                        'txt' or 'python' [default: xml]
-  --namespaces=NAMESPACES, --ns=NAMESPACES
-                        Allows to enumerate namespaces of interest. If not
-                        defined all namespaces available in database file will
-                        be processed. Separate several namespaces by comma,
-                        for example 'general,std.code.complexity' [default:
-                        none]
-  --nest-regions, --nr  If the option is set (True), data for regions is
-                        exported in the form of a tree. Otherwise, all regions
-                        are exported in plain list. [default: False]
+                        Format of the output data. Possible values are 'xml'
+                        and 'csv' [default: csv]

+ 1 - 1
mainline/tests/general/test_basic/test_help_view_default_stdout.gold.txt

@@ -1,4 +1,4 @@
-Usage: metrixpp.py export [options] -- [path 1] ... [path N]
+Usage: metrixpp.py view [options] -- [path 1] ... [path N]
 
 Options:
   -h, --help            show this help message and exit

+ 4 - 1
mainline/tools/info.py

@@ -68,7 +68,10 @@ def main(tool_args):
         for field in loader.get_namespace(each).iterate_field_names():
             prev_value_str = ""
             if loader_prev != None:
-                prev = loader_prev.get_namespace(each).get_field_packager(field)
+                prev = None
+                prev_namespace = loader_prev.get_namespace(each)
+                if prev_namespace != None:
+                    prev = prev_namespace.get_field_packager(field)
                 if prev == None:
                     prev_value_str = " [new]"
                     print "(!)",

+ 1 - 1
mainline/tools/view.py

@@ -39,7 +39,7 @@ def main(tool_args):
     log_plugin = core.log.Plugin()
     db_plugin = core.db.post.Plugin()
 
-    parser = core.cmdparser.MultiOptionParser(usage="Usage: %prog export [options] -- [path 1] ... [path N]")
+    parser = core.cmdparser.MultiOptionParser(usage="Usage: %prog view [options] -- [path 1] ... [path N]")
     log_plugin.declare_configuration(parser)
     db_plugin.declare_configuration(parser)
     parser.add_option("--format", "--ft", default='xml', choices=['txt', 'xml', 'python'], help="Format of the output data. "