Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv2108
Modified Files:
basic_cmds.py cvs_shell.py utils.py
Log Message:
* fixed bug with regular expression in CVS/Entries parser
Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** basic_cmds.py 4 Aug 2002 17:28:13 -0000 1.22
--- basic_cmds.py 7 Aug 2002 21:37:12 -0000 1.23
***************
*** 135,140 ****
fullname = os.path.join(dirname, name)
if not os.path.exists(fullname):
! myEntries.append(Entry(dirname, name, Entry.S_DELETED))
else:
ltstamp = os.path.getmtime(fullname)
info = '%s (rd: %s, wd: %s)' % (revision, strftime(app.dateFormat, localtime(rtstamp)),
--- 135,141 ----
fullname = os.path.join(dirname, name)
if not os.path.exists(fullname):
! myEntries.append(Entry(dirname, name, 'locally-deleted'))
else:
+ namesToProcess.remove(name)
ltstamp = os.path.getmtime(fullname)
info = '%s (rd: %s, wd: %s)' % (revision, strftime(app.dateFormat, localtime(rtstamp)),
***************
*** 144,149 ****
else:
myEntries.append(Entry(dirname, name, Entry.S_MODIFIED, info))
- namesToProcess.remove(name)
for name in cvsEntries[1].keys():
fullname = os.path.join(dirname, name)
if not os.path.exists(fullname):
--- 145,150 ----
else:
myEntries.append(Entry(dirname, name, Entry.S_MODIFIED, info))
for name in cvsEntries[1].keys():
+ namesToProcess.remove(name)
fullname = os.path.join(dirname, name)
if not os.path.exists(fullname):
***************
*** 151,155 ****
else:
myEntries.append(Entry(dirname, name, Entry.S_OK))
- namesToProcess.remove(name)
# only files not under CVS control are contained in names.
for name in namesToProcess:
--- 152,155 ----
Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** cvs_shell.py 4 Aug 2002 17:25:48 -0000 1.30
--- cvs_shell.py 7 Aug 2002 21:37:12 -0000 1.31
***************
*** 471,484 ****
class Entry(GetSetProvider):
! S_NEW = 'N' # what's this??
! S_ADDED = 'A'
! S_CONFLICT = 'C'
! S_MODIFIED = 'M'
! S_PATCHED = 'P'
! S_REMOVED = 'R'
! 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
statusToColorKey = None
def __init__(self, dir, name, status, info=''):
--- 471,483 ----
class Entry(GetSetProvider):
! S_ADDED = 'A' # file was added to the repository but has not been commited
! S_CONFLICT = 'C' # there is a conflict between the repository revision and the working revison
! S_MODIFIED = 'M' # file was locally modified
! S_PATCHED = 'P' # file was patched by the server
! S_REMOVED = 'R' # file has been scheduled for removal, but has not been commited
! S_UPDATED = 'U' # file was updated by the server
! S_UNKNOWN = '?' # status is unknown
S_OK = 'OK' # file on the sandbox is in sync with repository
! S_DELETED = 'D' # removal has been commited to the repository
statusToColorKey = None
def __init__(self, dir, name, status, info=''):
Index: utils.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/utils.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** utils.py 29 Jul 2002 17:29:10 -0000 1.12
--- utils.py 7 Aug 2002 21:37:12 -0000 1.13
***************
*** 82,86 ****
return result
! lineRe = re.compile(r'(?P<isdir>D?)/(?P<name>[^/]*)/(?P<revision>[^/]*)/(?P<mtime>[^/]*)//')
def parseCvsEntries(dir):
--- 82,86 ----
return result
! lineRe = re.compile(r'(?P<isdir>D?)/(?P<name>[^/]*)/(?P<revision>[^/]*)/(?P<mtime>[^/]*)/.*/')
def parseCvsEntries(dir):
|
