summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2004-05-07 12:22:06 +0000
committerBjörn Stenberg <bjorn@haxx.se>2004-05-07 12:22:06 +0000
commit59fb25d2a9a4ddc982751d6ef2f9a368d29d4abe (patch)
treed471965419aa56485839496f82e3ba531ff361bc
parent79e4b49433ae9ad77e91dca19fc455823c08733c (diff)
downloadrockbox-59fb25d2a9a4ddc982751d6ef2f9a368d29d4abe.tar.gz
rockbox-59fb25d2a9a4ddc982751d6ef2f9a368d29d4abe.tar.bz2
rockbox-59fb25d2a9a4ddc982751d6ef2f9a368d29d4abe.zip
Experimenting with USER
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4579 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--CVSROOT/loginfo2
-rwxr-xr-xCVSROOT/syncmail9
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 @@
#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
-CVSROOT $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} bjorn@haxx.se
+CVSROOT $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} -U $USER bjorn@haxx.se
^apps $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se
^flash $CVSROOT/CVSROOT/syncmail -C4 -u %{sVv} rockbox-cvs@cool.haxx.se
^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
-u
Produce a unified diff (smaller, but harder to read).
+ -U user
+ Mark diff as made by user.
+
<%%S>
CVS %%s loginfo expansion. When invoked by CVS, this will be a single
string containing the directory the checkin is being made in, relative
@@ -174,6 +177,8 @@ def main():
contextlines = 2
elif opt == '-u':
contextlines = 0
+ elif opt == '-U':
+ username = arg
# What follows is the specification containing the files that were
# modified. The argument actually must be split, with the first component
@@ -198,8 +203,8 @@ def main():
return
if specs[-3:] == ['-', 'New', 'directory']:
del specs[-3:]
- print 'Generating notification message...'
- blast_mail(mailcmd, specs[1:], contextlines)
+ print '%s generating notification message...' % username
+ # blast_mail(mailcmd, specs[1:], contextlines)
print 'Generating notification message... done.'