Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv28770
Modified Files:
utils.py
Log Message:
* Made sort routine work with python 2.1
* Improved printing of entrylist
Index: utils.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/utils.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** utils.py 7 Mar 2002 00:03:24 -0000 1.1.1.1
--- utils.py 7 Mar 2002 10:43:12 -0000 1.2
***************
*** 16,41 ****
def sortEntries(self):
! def __cmp(x,y):
! try:
! i = 0
! for attr in self.sortOrder:
! i = eval("cmp(x.%s, y.%s)" % (attr,attr))
! if i != 0: return i
! return i
! except AttributeError:
! return -1
! self.entries.sort(__cmp)
def printEntries(self, output):
! id = 0
! formatStr = " %%%dd %%s\n" % len(`len(self.entries)`)
! oldDir = ''
if len(self.entries) == 0:
output.write('No entries available.\n')
for e in self.entries:
newDir = e.dir
if oldDir != newDir:
output.write("%s:\n" % newDir)
! output.write(formatStr % (id, e))
id += 1
oldDir = newDir
--- 16,47 ----
def sortEntries(self):
! class __EntrySorter:
! def __init__(self, order): self.order = order
! def cmp(self,x,y):
! try:
! i = 0
! for attr in self.order:
! i = eval("cmp(x.%s, y.%s)" % (attr,attr))
! if i != 0: return i
! return i
! except AttributeError:
! return -1
! self.entries.sort(__EntrySorter(self.sortOrder).cmp)
def printEntries(self, output):
! max = 0
! for e in self.entries:
! l = len(e.status)
! if l > max: max = l
! formatStr = " %%%dd %%-%ds %%s\n" % (len(`len(self.entries)`), max)
! oldDir = None
if len(self.entries) == 0:
output.write('No entries available.\n')
+ id = 0
for e in self.entries:
newDir = e.dir
if oldDir != newDir:
output.write("%s:\n" % newDir)
! output.write(formatStr % (id, e.status, e.name))
id += 1
oldDir = newDir
***************
*** 54,58 ****
S_UPDATED = 'U'
S_UNKNOWN = '?'
! S_OK = 'O' # file on the sandbox is in sync with repository
S_DELETED = 'D' # file scheduled for removal has been commited
def __init__(self, dir, name, status):
--- 60,64 ----
S_UPDATED = 'U'
S_UNKNOWN = '?'
! S_OK = 'OK' # file on the sandbox is in sync with repository
S_DELETED = 'D' # file scheduled for removal has been commited
def __init__(self, dir, name, status):
***************
*** 60,66 ****
self.name = name
self.status = status
- def __repr__(self):
- return "%s %s" % (self.status, self.name)
-
###########################
--- 66,69 ----
|
