Update of /cvsroot/cvsshell/cvsshell/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21364/src
Modified Files:
cvs_shell.py
Log Message:
Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** cvs_shell.py 15 Apr 2003 13:40:10 -0000 1.38
--- cvs_shell.py 16 Apr 2003 22:06:58 -0000 1.39
***************
*** 36,40 ****
from plugable_app import PlugableApp
! VERSION = '0.5.0rc3'
NAME ='CvsShell'
COPYRIGHT = 'Copyright 2002, 2003 Stefan Heimann (ma...@st...).\n' \
--- 36,40 ----
from plugable_app import PlugableApp
! VERSION = '0.5.0rc4'
NAME ='CvsShell'
COPYRIGHT = 'Copyright 2002, 2003 Stefan Heimann (ma...@st...).\n' \
***************
*** 497,503 ****
return ' -m ' + msg + ' '
! def getCvsIgnoreFilter(self, dirname):
! """Returns a filter that contains the patterns in the .cvsignore file of
! the given directory."""
def readFromFile(path):
l = []
--- 497,506 ----
return ' -m ' + msg + ' '
! def getCvsIgnoreFilter(self, dirname=None):
! """
! Returns a filter that contains the patterns in the ~/.cvsignore file, the
! $CVSIGNORE environment variable and the .cvsignore file found in directory
! dirname (this file is ignored if dirname is None).
! """
def readFromFile(path):
l = []
***************
*** 516,521 ****
# filter in ~/.cvsshellrc
filter.addPatterns(string.split(self.configMap.get('filter','')))
! # ./.cvsignore
! filter.addPatterns(readFromFile(os.path.join(dirname, '.cvsignore')))
# now we have all patterns. The CVS manual says:
# "a single exclamation mark (`!') clears the ignore list"
--- 519,525 ----
# filter in ~/.cvsshellrc
filter.addPatterns(string.split(self.configMap.get('filter','')))
! # ./.cvsignore
! if dirname is not None:
! filter.addPatterns(readFromFile(os.path.join(dirname, '.cvsignore')))
# now we have all patterns. The CVS manual says:
# "a single exclamation mark (`!') clears the ignore list"
***************
*** 568,572 ****
self.rootDir = rootDir
self.sortOrder = ['dir', 'status', 'name']
! self.entries = entries
def sortEntries(self):
--- 572,586 ----
self.rootDir = rootDir
self.sortOrder = ['dir', 'status', 'name']
! # .cvsignore filter
! filters = {}
! self.entries = []
! for e in entries:
! if filters.has_key(e.dir):
! filter = filters[e.dir]
! else:
! filter = app.getCvsIgnoreFilter(e.dir)
! filters[e.dir] = filter
! if not filter.filter(e.name):
! self.entries.append(e)
def sortEntries(self):
|
