[Cvsshell-devel] CVS: cvsshell/src cvs_shell.py,1.29,1.30

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv32410

Modified Files:
	cvs_shell.py 
Log Message:
fixed id-bug (sf-id: 590596)


Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** cvs_shell.py	29 Jul 2002 17:29:10 -0000	1.29
--- cvs_shell.py	4 Aug 2002 17:25:48 -0000	1.30
***************
*** 91,94 ****
--- 91,95 ----
          self.completeableCommands = self.getAvailableCommands()
          self.dateFormat = '%Y-%m-%d %H:%M'
+         self.showUnmodified = 0
  
      def postStart(self):
***************
*** 183,207 ****
              self.setDirtyListing(1)
          # pare args as the could specify ids in the listing
!         def __doIt(e, filename):
!             return filename
          try:
              # ids only
!             l = self.applyOnEntryList(args, __doIt)
              args = string.join(l)
              self.setDirtyListing(1)
!         except utils.ParseError:
!             # maybe ids mixed with other options (the ids are then enclosed in [[ ... ]]
!             beg = args.find('[[')
!             end = args.find(']]')
!             if beg > 0 and end > beg:
!                 pre = args[:beg]
!                 post = args[end+2:]
!                 ids = args[beg+2 : end]
!                 try:
!                     l = self.applyOnEntryList(ids, __doIt)
!                     args = pre + string.join(l) + post
!                     self.setDirtyListing(1)
!                 except utilsParseError: pass
!         except AppError, msg: pass
          try:
              self.shell('%s %s' % (name, args))
--- 184,207 ----
              self.setDirtyListing(1)
          # pare args as the could specify ids in the listing
!         doIt = lambda e, filename: filename
          try:
              # ids only
!             l = self.applyOnEntryList(args, doIt)
              args = string.join(l)
              self.setDirtyListing(1)
!         except utils.ParseError: pass
!         except AppError, msg: pass    
!         # maybe ids mixed with other options (the ids are then enclosed in [[ ... ]]
!         beg = args.find('[[')
!         end = args.find(']]')
!         if beg >= 0 and end > beg:
!             pre = args[:beg]
!             post = args[end+2:]
!             ids = args[beg+2 : end]
!             try:
!                 l = self.applyOnEntryList(ids, doIt)
!                 args = pre + string.join(l) + post
!                 self.setDirtyListing(1)
!             except utilsParseError: pass
          try:
              self.shell('%s %s' % (name, args))
***************
*** 439,443 ****
--- 439,448 ----
          lines = []
          self.app.printMsg('Root Directory: ' + os.path.abspath(self.rootDir))
+         hidden = 0
          for e in self.entries:
+             if e.status == Entry.S_OK and not self.app.showUnmodified:
+                 hidden += 1
+                 id += 1
+                 continue
              newDir = e.dir
              if oldDir != newDir:
***************
*** 456,459 ****
--- 461,466 ----
          if footer:
              lines.append(footer + '\n')
+         if hidden:
+             lines.append("%d files are unmodified.\nEnable the option `show-unmodified' to show these files.\n" % hidden)
          self.app.more(lines)