Forwarding back to the list (@Janos I'll have a look later when I check my svn-dev mailbox, rather than my personal one)
----- Forwarded message from Janos Gyerik <janos.gye...@gmail.com> ----- > From: Janos Gyerik <janos.gye...@gmail.com> > Subject: Re: [PATCH] minor change to mailer.py for subject formatting > To: Daniel Shahaf <d...@daniel.shahaf.name> > Date: Sat, 26 Jan 2013 21:37:39 +0100 > Message-ID: > <caahxzx+epbb6+4fbhxvb7pk8nteox4fc+59hprtkgexmcad...@mail.gmail.com> > > Hi Daniel, > > Thanks a lot for your comments! > > Please check the new patch I attached, I hope it's good now. > > Thanks, > Janos > > On Sat, Jan 26, 2013 at 9:03 PM, Daniel Shahaf <d...@daniel.shahaf.name> > 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? > > > >> + reponame = > >> os.path.basename(os.path.dirname(os.path.dirname(__file__))) > > > > That's outright wrong. You can't assume that post-commit is a symlink > > to mailer.py. (Just read post-commit.tmpl for a counterexample.) > > > >> + prefix = re.sub(r'REPONAME', reponame, prefix) > > > > Daniel > > (very brief review, and the setup I help maintain uses svnmailer not > > mailer.py, so if the above doesn't make sense sorry and please correct me) > > > > -- > 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]) ----- End forwarded message -----