summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/checkoutlist14
-rw-r--r--CVSROOT/commitinfo15
-rw-r--r--CVSROOT/config14
-rw-r--r--CVSROOT/cvswrappers23
-rw-r--r--CVSROOT/editinfo21
-rw-r--r--CVSROOT/loginfo38
-rw-r--r--CVSROOT/modules31
-rw-r--r--CVSROOT/notify12
-rw-r--r--CVSROOT/rcsinfo13
-rwxr-xr-xCVSROOT/syncmail217
-rw-r--r--CVSROOT/taginfo20
-rw-r--r--CVSROOT/verifymsg21
12 files changed, 0 insertions, 439 deletions
diff --git a/CVSROOT/checkoutlist b/CVSROOT/checkoutlist
deleted file mode 100644
index 4c45a691d0..0000000000
--- a/CVSROOT/checkoutlist
+++ /dev/null
@@ -1,14 +0,0 @@
1# The "checkoutlist" file is used to support additional version controlled
2# administrative files in $CVSROOT/CVSROOT, such as template files.
3#
4# The first entry on a line is a filename which will be checked out from
5# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
6# The remainder of the line is an error message to use if the file cannot
7# be checked out.
8#
9# File format:
10#
11# [<whitespace>]<filename><whitespace><error message><end-of-line>
12#
13# comment lines begin with '#'
14syncmail
diff --git a/CVSROOT/commitinfo b/CVSROOT/commitinfo
deleted file mode 100644
index b19e7b7a63..0000000000
--- a/CVSROOT/commitinfo
+++ /dev/null
@@ -1,15 +0,0 @@
1# The "commitinfo" file is used to control pre-commit checks.
2# The filter on the right is invoked with the repository and a list
3# of files to check. A non-zero exit of the filter program will
4# cause the commit to be aborted.
5#
6# The first entry on a line is a regular expression which is tested
7# against the directory that the change is being committed to, relative
8# to the $CVSROOT. For the first match that is found, then the remainder
9# of the line is the name of the filter to run.
10#
11# If the repository name does not match any of the regular expressions in this
12# file, the "DEFAULT" line is used, if it is specified.
13#
14# If the name "ALL" appears as a regular expression it is always used
15# in addition to the first matching regex or "DEFAULT".
diff --git a/CVSROOT/config b/CVSROOT/config
deleted file mode 100644
index a1f3a82709..0000000000
--- a/CVSROOT/config
+++ /dev/null
@@ -1,14 +0,0 @@
1# Set this to "no" if pserver shouldn't check system users/passwords
2#SystemAuth=no
3
4# Set `PreservePermissions' to `yes' to save file status information
5# in the repository.
6#PreservePermissions=no
7
8# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
9# level of the new working directory when using the `cvs checkout'
10# command.
11#TopLevelAdmin=no
12
13# use new info format
14UseNewInfoFmtStrings=yes
diff --git a/CVSROOT/cvswrappers b/CVSROOT/cvswrappers
deleted file mode 100644
index 0accaf1b15..0000000000
--- a/CVSROOT/cvswrappers
+++ /dev/null
@@ -1,23 +0,0 @@
1# This file affects handling of files based on their names.
2#
3# The -t/-f options allow one to treat directories of files
4# as a single file, or to transform a file in other ways on
5# its way in and out of CVS.
6#
7# The -m option specifies whether CVS attempts to merge files.
8#
9# The -k option specifies keyword expansion (e.g. -kb for binary).
10#
11# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
12#
13# wildcard [option value][option value]...
14#
15# where option is one of
16# -f from cvs filter value: path to filter
17# -t to cvs filter value: path to filter
18# -m update methodology value: MERGE or COPY
19# -k expansion mode value: b, o, kkv, &c
20#
21# and value is a single-quote delimited value.
22# For example:
23#*.gif -k 'b'
diff --git a/CVSROOT/editinfo b/CVSROOT/editinfo
deleted file mode 100644
index d78886c152..0000000000
--- a/CVSROOT/editinfo
+++ /dev/null
@@ -1,21 +0,0 @@
1# The "editinfo" file is used to allow verification of logging
2# information. It works best when a template (as specified in the
3# rcsinfo file) is provided for the logging procedure. Given a
4# template with locations for, a bug-id number, a list of people who
5# reviewed the code before it can be checked in, and an external
6# process to catalog the differences that were code reviewed, the
7# following test can be applied to the code:
8#
9# Making sure that the entered bug-id number is correct.
10# Validating that the code that was reviewed is indeed the code being
11# checked in (using the bug-id number or a seperate review
12# number to identify this particular code set.).
13#
14# If any of the above test failed, then the commit would be aborted.
15#
16# Actions such as mailing a copy of the report to each reviewer are
17# better handled by an entry in the loginfo file.
18#
19# One thing that should be noted is the the ALL keyword is not
20# supported. There can be only one entry that matches a given
21# repository.
diff --git a/CVSROOT/loginfo b/CVSROOT/loginfo
deleted file mode 100644
index 3de06d631b..0000000000
--- a/CVSROOT/loginfo
+++ /dev/null
@@ -1,38 +0,0 @@
1# The "loginfo" file controls where "cvs commit" log information
2# is sent. The first entry on a line is a regular expression which must match
3# the directory that the change is being made to, relative to the
4# $CVSROOT. If a match is found, then the remainder of the line is a filter
5# program that should expect log information on its standard input.
6#
7# If the repository name does not match any of the regular expressions in this
8# file, the "DEFAULT" line is used, if it is specified.
9#
10# If the name ALL appears as a regular expression it is always used
11# in addition to the first matching regex or DEFAULT.
12#
13# You may specify a format string as part of the
14# filter. The string is composed of a `%' followed
15# by a single format character, or followed by a set of format
16# characters surrounded by `{' and `}' as separators. The format
17# characters are:
18#
19# s = file name
20# V = old version number (pre-checkin)
21# v = new version number (post-checkin)
22#
23# For example:
24#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
25# or
26#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
27CVSROOT /usr/bin/syncmail -C4 -u %1{sVv} bjorn@haxx.se
28^apps /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
29^flash /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
30^firmware /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
31^docs /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
32^uisimulator /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
33^tools /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
34^gdb /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
35^bootloader /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
36^wps /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
37^manual /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
38^rbutil /usr/bin/syncmail -C4 -u -S "$USER: " %1{sVv} rockbox-cvs@cool.haxx.se
diff --git a/CVSROOT/modules b/CVSROOT/modules
deleted file mode 100644
index 904d9d96c1..0000000000
--- a/CVSROOT/modules
+++ /dev/null
@@ -1,31 +0,0 @@
1# Three different line formats are valid:
2# key -a aliases...
3# key [options] directory
4# key [options] directory files...
5#
6# Where "options" are composed of:
7# -i prog Run "prog" on "cvs commit" from top-level of module.
8# -o prog Run "prog" on "cvs checkout" of module.
9# -e prog Run "prog" on "cvs export" of module.
10# -t prog Run "prog" on "cvs rtag" of module.
11# -u prog Run "prog" on "cvs update" of module.
12# -d dir Place module in directory "dir" instead of module name.
13# -l Top-level directory only -- do not recurse.
14#
15# NOTE: If you change any of the "Run" options above, you'll have to
16# release and re-checkout any working directories of these modules.
17#
18# And "directory" is a path to a directory relative to $CVSROOT.
19#
20# The "-a" option specifies an alias. An alias is interpreted as if
21# everything on the right of the "-a" had been typed on the command line.
22#
23# You can encode a module within a module by using the special '&'
24# character to interpose another module into the current module. This
25# can be useful for creating a module that consists of many directories
26# spread out over the entire source repository.
27
28rockbox &apps &firmware &docs &tools &fonts &wps
29rockbox-devel &apps &flash &firmware &fonts &bootloader &docs &tools &uisimulator &gdb &wps &manual
30rockbox-all &apps &flash &firmware &fonts &bootloader &docs &tools &uisimulator &gdb &www &wps &manual
31website &www &docs
diff --git a/CVSROOT/notify b/CVSROOT/notify
deleted file mode 100644
index 34f0bc2888..0000000000
--- a/CVSROOT/notify
+++ /dev/null
@@ -1,12 +0,0 @@
1# The "notify" file controls where notifications from watches set by
2# "cvs watch add" or "cvs edit" are sent. The first entry on a line is
3# a regular expression which is tested against the directory that the
4# change is being made to, relative to the $CVSROOT. If it matches,
5# then the remainder of the line is a filter program that should contain
6# one occurrence of %s for the user to notify, and information on its
7# standard input.
8#
9# "ALL" or "DEFAULT" can be used in place of the regular expression.
10#
11# For example:
12#ALL mail %s -s "CVS notification"
diff --git a/CVSROOT/rcsinfo b/CVSROOT/rcsinfo
deleted file mode 100644
index 49e59f4d0d..0000000000
--- a/CVSROOT/rcsinfo
+++ /dev/null
@@ -1,13 +0,0 @@
1# The "rcsinfo" file is used to control templates with which the editor
2# is invoked on commit and import.
3#
4# The first entry on a line is a regular expression which is tested
5# against the directory that the change is being made to, relative to the
6# $CVSROOT. For the first match that is found, then the remainder of the
7# line is the name of the file that contains the template.
8#
9# If the repository name does not match any of the regular expressions in this
10# file, the "DEFAULT" line is used, if it is specified.
11#
12# If the name "ALL" appears as a regular expression it is always used
13# in addition to the first matching regex or "DEFAULT".
diff --git a/CVSROOT/syncmail b/CVSROOT/syncmail
deleted file mode 100755
index fa24a8052a..0000000000
--- a/CVSROOT/syncmail
+++ /dev/null
@@ -1,217 +0,0 @@
1#! /usr/bin/python
2# -*- Python -*-
3
4"""Complicated notification for CVS checkins.
5
6This script is used to provide email notifications of changes to the CVS
7repository. These email changes will include context diffs of the changes.
8Really big diffs will be trimmed.
9
10This script is run from a CVS loginfo file (see $CVSROOT/CVSROOT/loginfo). To
11set this up, create a loginfo entry that looks something like this:
12
13 mymodule /path/to/this/script %%s some-email-addr@your.domain
14
15In this example, whenever a checkin that matches `mymodule' is made, this
16script is invoked, which will generate the diff containing email, and send it
17to some-email-addr@your.domain.
18
19 Note: This module used to also do repository synchronizations via
20 rsync-over-ssh, but since the repository has been moved to SourceForge,
21 this is no longer necessary. The syncing functionality has been ripped
22 out in the 3.0, which simplifies it considerably. Access the 2.x versions
23 to refer to this functionality. Because of this, the script is misnamed.
24
25It no longer makes sense to run this script from the command line. Doing so
26will only print out this usage information.
27
28Usage:
29
30 %(PROGRAM)s [options] <%%S> email-addr [email-addr ...]
31
32Where options is:
33
34 --cvsroot=<path>
35Use <path> as the environment variable CVSROOT. Otherwise this
36 variable must exist in the environment.
37
38 --help
39 -h
40 Print this text.
41
42 --context=#
43 -C #
44 Include # lines of context around lines that differ (default: 2).
45
46 -c
47 Produce a context diff (default).
48
49 -u
50 Produce a unified diff (smaller, but harder to read).
51
52 -U user
53 Mark diff as made by user.
54
55 <%%S>
56CVS %%s loginfo expansion. When invoked by CVS, this will be a single
57 string containing the directory the checkin is being made in, relative
58 to $CVSROOT, followed by the list of files that are changing. If the
59 %%s in the loginfo file is %%{sVv}, context diffs for each of the
60 modified files are included in any email messages that are generated.
61
62 email-addrs
63 At least one email address.
64
65"""
66
67import os
68import sys
69import string
70import time
71import getopt
72
73# Notification command
74MAILCMD = '/bin/mail -s "%(username)s: %(SUBJECT)s" %(PEOPLE)s 2>&1 > /dev/null'
75
76# Diff trimming stuff
77DIFF_HEAD_LINES = 20
78DIFF_TAIL_LINES = 20
79DIFF_TRUNCATE_IF_LARGER = 1000
80
81PROGRAM = sys.argv[0]
82
83
84
85def usage(code, msg=''):
86 print __doc__ % globals()
87 if msg:
88 print msg
89 sys.exit(code)
90
91
92
93def calculate_diff(filespec, contextlines):
94 try:
95 file, oldrev, newrev = string.split(filespec, ',')
96 except ValueError:
97 # No diff to report
98 return '***** Bogus filespec: %s' % filespec
99 if oldrev == 'NONE':
100 try:
101 if os.path.exists(file):
102 fp = open(file)
103 else:
104 update_cmd = 'cvs -fn update -r %s -p %s' % (newrev, file)
105 fp = os.popen(update_cmd)
106 lines = fp.readlines()
107 fp.close()
108 lines.insert(0, '--- NEW FILE: %s ---\n' % file)
109 except IOError, e:
110 lines = ['***** Error reading new file: ',
111 str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()]
112 elif newrev == 'NONE':
113 lines = ['--- %s DELETED ---\n' % file]
114 else:
115 # This /has/ to happen in the background, otherwise we'll run into CVS
116 # lock contention. What a crock.
117 if contextlines > 0:
118 difftype = "-C " + str(contextlines)
119 else:
120 difftype = "-uN"
121 diffcmd = '/usr/bin/cvs -f diff -kk %s -b -r %s -r %s %s' % (
122 difftype, oldrev, newrev, file)
123 fp = os.popen(diffcmd)
124 lines = fp.readlines()
125 sts = fp.close()
126 # ignore the error code, it always seems to be 1 :(
127## if sts:
128## return 'Error code %d occurred during diff\n' % (sts >> 8)
129 if len(lines) > DIFF_TRUNCATE_IF_LARGER:
130 removedlines = len(lines) - DIFF_HEAD_LINES - DIFF_TAIL_LINES
131 del lines[DIFF_HEAD_LINES:-DIFF_TAIL_LINES]
132 lines.insert(DIFF_HEAD_LINES,
133 '[...%d lines suppressed...]\n' % removedlines)
134 return string.join(lines, '')
135
136
137
138def blast_mail(mailcmd, filestodiff, contextlines):
139 # cannot wait for child process or that will cause parent to retain cvs
140 # lock for too long. Urg!
141 if not os.fork():
142 # in the child
143 # give up the lock you cvs thang!
144 time.sleep(2)
145 fp = os.popen(mailcmd, 'w')
146 fp.write(sys.stdin.read())
147 fp.write('\n')
148 # append the diffs if available
149 for file in filestodiff:
150 fp.write(calculate_diff(file, contextlines))
151 fp.write('\n')
152 fp.close()
153 # doesn't matter what code we return, it isn't waited on
154 os._exit(0)
155
156
157
158# scan args for options
159def main():
160 contextlines = 2
161 try:
162 opts, args = getopt.getopt(sys.argv[1:], 'hC:cuU:',
163 ['context=', 'cvsroot=', 'help'])
164 except getopt.error, msg:
165 usage(1, msg)
166
167 username = 'unknown'
168
169 # parse the options
170 for opt, arg in opts:
171 if opt in ('-h', '--help'):
172 usage(0)
173 elif opt == '--cvsroot':
174 os.environ['CVSROOT'] = arg
175 elif opt in ('-C', '--context'):
176 contextlines = int(arg)
177 elif opt == '-c':
178 if contextlines <= 0:
179 contextlines = 2
180 elif opt == '-u':
181 contextlines = 0
182 elif opt == '-U':
183 username = arg
184
185 # What follows is the specification containing the files that were
186 # modified. The argument actually must be split, with the first component
187 # containing the directory the checkin is being made in, relative to
188 # $CVSROOT, followed by the list of files that are changing.
189 if not args:
190 usage(1, 'No CVS module specified')
191 SUBJECT = args[0]
192 specs = string.split(args[0])
193 del args[0]
194
195 # The remaining args should be the email addresses
196 if not args:
197 usage(1, 'No recipients specified')
198
199 # Now do the mail command
200 PEOPLE = string.join(args)
201 mailcmd = MAILCMD % vars()
202
203 print 'Mailing %s...' % PEOPLE
204 if specs == ['-', 'Imported', 'sources']:
205 return
206 if specs[-3:] == ['-', 'New', 'directory']:
207 del specs[-3:]
208 print 'Generating notification message...'
209 blast_mail(mailcmd, specs[1:], contextlines)
210 print 'Generating notification message... done.'
211
212
213
214if __name__ == '__main__':
215 main()
216 sys.exit(0)
217
diff --git a/CVSROOT/taginfo b/CVSROOT/taginfo
deleted file mode 100644
index 274a46dd5b..0000000000
--- a/CVSROOT/taginfo
+++ /dev/null
@@ -1,20 +0,0 @@
1# The "taginfo" file is used to control pre-tag checks.
2# The filter on the right is invoked with the following arguments:
3#
4# $1 -- tagname
5# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
6# $3 -- repository
7# $4-> file revision [file revision ...]
8#
9# A non-zero exit of the filter program will cause the tag to be aborted.
10#
11# The first entry on a line is a regular expression which is tested
12# against the directory that the change is being committed to, relative
13# to the $CVSROOT. For the first match that is found, then the remainder
14# of the line is the name of the filter to run.
15#
16# If the repository name does not match any of the regular expressions in this
17# file, the "DEFAULT" line is used, if it is specified.
18#
19# If the name "ALL" appears as a regular expression it is always used
20# in addition to the first matching regex or "DEFAULT".
diff --git a/CVSROOT/verifymsg b/CVSROOT/verifymsg
deleted file mode 100644
index 86f747ce22..0000000000
--- a/CVSROOT/verifymsg
+++ /dev/null
@@ -1,21 +0,0 @@
1# The "verifymsg" file is used to allow verification of logging
2# information. It works best when a template (as specified in the
3# rcsinfo file) is provided for the logging procedure. Given a
4# template with locations for, a bug-id number, a list of people who
5# reviewed the code before it can be checked in, and an external
6# process to catalog the differences that were code reviewed, the
7# following test can be applied to the code:
8#
9# Making sure that the entered bug-id number is correct.
10# Validating that the code that was reviewed is indeed the code being
11# checked in (using the bug-id number or a seperate review
12# number to identify this particular code set.).
13#
14# If any of the above test failed, then the commit would be aborted.
15#
16# Actions such as mailing a copy of the report to each reviewer are
17# better handled by an entry in the loginfo file.
18#
19# One thing that should be noted is the the ALL keyword is not
20# supported. There can be only one entry that matches a given
21# repository.