Update of /cvsroot/cvs-syncmail/syncmail
In directory sc8-pr-cvs1:/tmp/cvs-serv28022
Modified Files:
branchctl
Log Message:
- update commented-out code
- remove function that isn't used in this script
Index: branchctl
===================================================================
RCS file: /cvsroot/cvs-syncmail/syncmail/branchctl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- branchctl 14 Jul 2003 16:49:30 -0000 1.2
+++ branchctl 14 Jul 2003 18:11:47 -0000 1.3
@@ -141,42 +141,13 @@
## name = string.split(line, "/")[1]
## dirname = namekey(prefix, name)
## if os.path.isdir(dirname):
-## m = load_change_info(dirname)
+## m = load_entries(dirname)
## mapping.update(m)
if line[0] == "/":
# normal file
get_entry(prefix, mapping, line, entries_fn)
# else: bogus Entries line
f.close()
- return mapping
-
-def load_change_info(mapping, prefix=None):
- if prefix is not None:
- entries_log_fn = os.path.join(prefix, "CVS", "Entries.Log")
- else:
- entries_log_fn = os.path.join("CVS", "Entries.Log")
- if os.path.isfile(entries_log_fn):
- f = open(entries_log_fn)
- while 1:
- line = f.readline()
- if not line:
- break
- if line[1:2] != ' ':
- # really old version of CVS
- break
- entry = get_entry(prefix, mapping, line[2:], entries_log_fn)
- parts = string.split(line, "/")[1:]
- if line[0] == "A":
- # adding a file
- entry.new_revision = parts[1]
- elif line[0] == "R":
- # removing a file
- entry.new_revision = None
- f.close()
- for entry in mapping.values():
- if not hasattr(entry, "new_revision"):
- print 'confused about file', entry.name, '-- ignoring'
- del mapping[entry.name]
return mapping
def load_branch_name():
|
