Hey guys, Thanks a lot for your comments!
Please check the new patch I attached, I hope it's good now. It will allow this kind of setting in mailer.conf: commit_subject_prefix = [svn-%(repodir)s] Thanks, Janos On Sun, Jan 27, 2013 at 5:36 AM, C. Michael Pilato <cmpil...@collab.net> wrote: > On 01/26/2013 03:03 PM, Daniel Shahaf wrote: >> Please attach patches as MIME text/plain (usually naming them *.txt does >> that). More below. >> >>> + if prefix and re.search(r'REPONAME', prefix): >> >> Needlessly complicated, ('REPONAME' in prefix) would do. >> >> Also I think you should use the %() syntax like mailer.conf.example >> does. Is that possible? > > Agreed, please use the "%()s" style of format string substitution if > possible (for consistency with other configurable bits of this script). > > -- > C. Michael Pilato <cmpil...@collab.net> > CollabNet <> www.collab.net <> Enterprise Cloud Development > -- Janos Gyerik http://www.janosgyerik.com/ https://twitter.com/janosgyerik/
Index: tools/hook-scripts/mailer/mailer.py =================================================================== --- tools/hook-scripts/mailer/mailer.py (revision 1438886) +++ tools/hook-scripts/mailer/mailer.py (working copy) @@ -98,7 +98,7 @@ def main(pool, cmd, config_fname, repos_dir, cmd_a if cmd == 'commit': revision = int(cmd_args[0]) repos = Repository(repos_dir, revision, pool) - cfg = Config(config_fname, repos, { 'author' : repos.author }) + cfg = Config(config_fname, repos, { 'author' : repos.author, 'repodir' : os.path.basename(repos.repos_dir) }) messenger = Commit(pool, cfg, repos) elif cmd == 'propchange' or cmd == 'propchange2': revision = int(cmd_args[0])