diff options
Diffstat (limited to 'CVSROOT')
-rw-r--r-- | CVSROOT/loginfo | 2 | ||||
-rwxr-xr-x | CVSROOT/syncmail | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CVSROOT/loginfo b/CVSROOT/loginfo index 8dda557913..6f74afd453 100644 --- a/CVSROOT/loginfo +++ b/CVSROOT/loginfo | |||
@@ -24,7 +24,7 @@ | |||
24 | #DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog | 24 | #DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog |
25 | # or | 25 | # or |
26 | #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog | 26 | #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog |
27 | CVSROOT $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} bjorn@haxx.se | 27 | CVSROOT $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} -U $USER bjorn@haxx.se |
28 | ^apps $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se | 28 | ^apps $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se |
29 | ^flash $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se | 29 | ^flash $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se |
30 | ^firmware $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se | 30 | ^firmware $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se |
diff --git a/CVSROOT/syncmail b/CVSROOT/syncmail index ce467a80ba..3e61116a29 100755 --- a/CVSROOT/syncmail +++ b/CVSROOT/syncmail | |||
@@ -49,6 +49,9 @@ Use <path> as the environment variable CVSROOT. Otherwise this | |||
49 | -u | 49 | -u |
50 | Produce a unified diff (smaller, but harder to read). | 50 | Produce a unified diff (smaller, but harder to read). |
51 | 51 | ||
52 | -U user | ||
53 | Mark diff as made by user. | ||
54 | |||
52 | <%%S> | 55 | <%%S> |
53 | CVS %%s loginfo expansion. When invoked by CVS, this will be a single | 56 | CVS %%s loginfo expansion. When invoked by CVS, this will be a single |
54 | string containing the directory the checkin is being made in, relative | 57 | string containing the directory the checkin is being made in, relative |
@@ -174,6 +177,8 @@ def main(): | |||
174 | contextlines = 2 | 177 | contextlines = 2 |
175 | elif opt == '-u': | 178 | elif opt == '-u': |
176 | contextlines = 0 | 179 | contextlines = 0 |
180 | elif opt == '-U': | ||
181 | username = arg | ||
177 | 182 | ||
178 | # What follows is the specification containing the files that were | 183 | # What follows is the specification containing the files that were |
179 | # modified. The argument actually must be split, with the first component | 184 | # modified. The argument actually must be split, with the first component |
@@ -198,8 +203,8 @@ def main(): | |||
198 | return | 203 | return |
199 | if specs[-3:] == ['-', 'New', 'directory']: | 204 | if specs[-3:] == ['-', 'New', 'directory']: |
200 | del specs[-3:] | 205 | del specs[-3:] |
201 | print 'Generating notification message...' | 206 | print '%s generating notification message...' % username |
202 | blast_mail(mailcmd, specs[1:], contextlines) | 207 | # blast_mail(mailcmd, specs[1:], contextlines) |
203 | print 'Generating notification message... done.' | 208 | print 'Generating notification message... done.' |
204 | 209 | ||
205 | 210 | ||