ajack 2004/02/05 06:50:07
Modified: python/gump/model depend.py
python/gump/document forrest.py text.py
python/gump/utils commandLine.py
Log:
Reduced verbosity on dependencies
Revision Changes Path
1.8 +3 -3 jakarta-gump/python/gump/model/depend.py
Index: depend.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/depend.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- depend.py 23 Jan 2004 23:32:26 -0000 1.7
+++ depend.py 5 Feb 2004 14:50:07 -0000 1.8
@@ -107,7 +107,7 @@
ids = xmldepend.ids
- annotation = 'Expressed Dependency'
+ annotation = None # 'Expressed Dependency'
#
# Construct the dependency
1.63 +9 -9 jakarta-gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- forrest.py 1 Feb 2004 18:44:44 -0000 1.62
+++ forrest.py 5 Feb 2004 14:50:07 -0000 1.63
@@ -1108,18 +1108,18 @@
dependencySection=document.createSection('Dependency')
- self.documentDependenciesList(dependencySection, "Project Dependees",
\
- project.getDependees(), 1, project)
-
- self.documentDependenciesList(dependencySection, "Full Project Dependees",
\
- project.getFullDependees(), 1, project)
-
self.documentDependenciesList(dependencySection, "Project Dependencies",
\
project.getDependencies(), 0, project)
+ self.documentDependenciesList(dependencySection, "Project Dependees",
\
+ project.getDependees(), 1, project)
+
self.documentDependenciesList(dependencySection, "Full Project
Dependencies", \
project.getFullDependencies(), 0, project)
+ self.documentDependenciesList(dependencySection, "Full Project Dependees",
\
+ project.getFullDependees(), 1, project)
+
document.serialize()
1.7 +14 -4 jakarta-gump/python/gump/document/text.py
Index: text.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- text.py 5 Feb 2004 05:43:56 -0000 1.6
+++ text.py 5 Feb 2004 14:50:07 -0000 1.7
@@ -96,6 +96,13 @@
gumpSet = run.getGumpSet()
output=self.output
+
+ # Pretty sorting...
+ sortedModuleList=createOrderedList(gumpSet.getModules())
+ sortedProjectList=createOrderedList(gumpSet.getSequence())
+ sortedRepositoryList=createOrderedList(gumpSet.getRepositories())
+ sortedServerList=createOrderedList(workspace.getServers())
+
output.write(indent + "Workspace State : " +
workspace.getStateDescription() + "\n")
output.write(indent + "Workspace Secs : " + str(workspace.getElapsedSecs())
+ "\n")
@@ -104,7 +111,7 @@
self.documentAnnotations(indent,workspace)
indent += ' '
- for module in workspace.getModules():
+ for module in sortedModuleList:
if not gumpSet.inModules(module): continue
output.write(indent + "Module [" + module.getName() + "] State: " +
module.getStateDescription() + "\n")
output.write(indent + "Projects: " + str(len(module.getProjects())) +
"\n")
@@ -133,6 +140,9 @@
self.documentWork(indent,project)
def documentWork(self, indent, workable):
+
+ if not workable or not workable.worklist: return
+
indent += ' '
output=self.output
output.write(indent+"Work [" + str(len(workable.worklist)) \
1.7 +4 -4 jakarta-gump/python/gump/utils/commandLine.py
Index: commandLine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/utils/commandLine.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- commandLine.py 20 Jan 2004 21:55:23 -0000 1.6
+++ commandLine.py 5 Feb 2004 14:50:07 -0000 1.7
@@ -151,7 +151,7 @@
sys.exit(1)
for arg in self.args:
- log.info("Arguments:" + arg)
+ log.debug("Command Line Argument : " + arg)
def getArguments(self):
return self.args
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
