gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump gumpy.py .cvsignore
Date Wed, 03 Mar 2004 20:32:14 GMT
ajack       2004/03/03 12:32:14

  Modified:    python/gump/document forrest.py
               .        gumpy.py .cvsignore
  Log:
  1) More formatting for 'results on other servers'.
  2) Exclude gumpy.lock and gumpy.log
  3) Tweaks to gumpy.py (i.e. add --check)
  
  Revision  Changes    Path
  1.90      +10 -15    gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- forrest.py	1 Mar 2004 22:46:41 -0000	1.89
  +++ forrest.py	3 Mar 2004 20:32:14 -0000	1.90
  @@ -1391,8 +1391,6 @@
           serverResults=None
           if isinstance(linkable,Resultable) and linkable.hasServerResults():
               serverResults=linkable.getServerResults()
  -        else:
  -            log.debug('Have no Resultable for statePair ' + `linkable`)
               
           for server in servers: 
           
  @@ -1401,29 +1399,26 @@
               if serverResults and serverResults.has_key(server):
                   results=serverResults[server]
                   if results:
  -                    log.debug('Have statePair ' + `statePair`)
                       statePair=results.getStatePair()
  -                else:
  -                    log.debug('Have no results for statePair ' + `server`)
                                   
               # If we can resolve this object to a URL, then do
  +            dataNode=serverRow.createData()
               xdocNode=None
                           
               if server.hasResolver():
  -                xdocNode=serverRow.createData().createFork(	\
  +                xdocNode=dataNode.createFork(	\
                           server.getResolver().getUrl(linkable))
               else:
                   # Else just link to the server.
                   if server.hasUrl():
  -                    xdocNode=serverRow.createData().createFork(	\
  +                    xdocNode=dataNode.createFork(	\
                               server.getUrl())  
               
  -            if xdocNode and statePair:
  -                log.debug('Have xdocNode and statePair ' + `statePair`)
  -                depth=getDepthForObject(linkable)
  -                self.insertStatePairIconAtDepth(xdocNode,statePair,depth)
  -            else:
  +            if xdocNode:
                   xdocNode.createText('On ' + server.getName())
  +                if statePair:
  +                    depth=getDepthForObject(linkable)
  +                    self.insertStatePairIconAtDepth(dataNode,statePair,depth)         
      
                   
                           
       def documentProperties(self,xdocNode,propertyContainer,title='Properties'):
  
  
  
  1.9       +9 -1      gump/gumpy.py
  
  Index: gumpy.py
  ===================================================================
  RCS file: /home/cvs/gump/gumpy.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- gumpy.py	2 Mar 2004 21:11:39 -0000	1.8
  +++ gumpy.py	3 Mar 2004 20:32:14 -0000	1.9
  @@ -288,10 +288,18 @@
               #        
               iargs = '-w ../' + workspaceName + ' ' + projectsExpr + ' ' + ' '.join(sys.argv[1:])
     
  +            # Allow a check not an integrate
  +            check=0
  +            if '--check' in sys.argv:
  +                check=0
  +            
               #
               # Run the main Gump...
               #    
  -            integrationExit = runCommand('python gump/integrate.py', iargs, 'python')
  +            command='gump/integrate.py'
  +            if check:
  +                command='gump/check.py'
  +            integrationExit = runCommand('python '+command, iargs, 'python')
               if integrationExit:
                   result=1
   
  
  
  
  1.20      +3 -1      gump/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/gump/.cvsignore,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- .cvsignore	23 Feb 2004 20:55:08 -0000	1.19
  +++ .cvsignore	3 Mar 2004 20:32:14 -0000	1.20
  @@ -17,5 +17,7 @@
   local-env.sh
   local-eny-py.sh
   tsws1.xml
  +test
   x.txt
  -test
  \ No newline at end of file
  +gumpy.log
  +gumpy.lock
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message