bzr email commit hook

Merge lp:~maria-captains/bzr-email/serg into lp:bzr-email

  1. serg
  2. Merge into trunk
Proposed by Sergei Golubchik
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 49
Proposed branch: lp:~maria-captains/bzr-email/serg
Merge into: lp:bzr-email
Diff against target: 23 lines (+4/-2)
1 file modified
emailer.py (+4/-2)
To merge this branch: bzr merge lp:~maria-captains/bzr-email/serg
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+48197@code.launchpad.net

Description of the change

two new configuration options: post_commit_diffoptions and post_commit_log_format

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/1/2011 11:10 AM, Sergei wrote:
> Sergei has proposed merging lp:~maria-captains/bzr-email/serg into lp:bzr-email.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~maria-captains/bzr-email/serg/+merge/48197
>
> two new configuration options: post_commit_diffoptions and post_commit_log_format

Sounds good to me.

 review: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1MHD8ACgkQJdeBCYSNAAOTmgCeN3hMwldFvlz6RRcjc/ib+LMn
QccAn0EXC+fxx0Bu4bLKYiidikVgSmIq
=UMA7
-----END PGP SIGNATURE-----

review: Approve
lp:~maria-captains/bzr-email/serg updated
46. By Martin Pool

Write outgoing message to a file to try to avoid deadlocks

47. By Jelmer Vernooij

Merge support for ignoring TLS through a configuration option. Thanks Renato Silva.

48. By Jelmer Vernooij

Merge removal of support for pre-0.15 versions of bzr.

49. By Jelmer Vernooij

Merge support for new configuration options post_commit_diffoptions and post_commit_log_format.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'emailer.py'
2--- emailer.py 2010-10-09 23:23:15 +0000
3+++ emailer.py 2011-02-01 17:10:12 +0000
4@@ -65,7 +65,8 @@
5
6 outf.write('At %s\n\n' % self.url())
7
8- lf = log.log_formatter('long',
9+ log_format = self.config.get_user_option('post_commit_log_format')
10+ lf = log.log_formatter(log_format or 'long',
11 show_ids=True,
12 to_file=outf
13 )
14@@ -114,7 +115,8 @@
15 # 8-bit strings. It is an error to write a Unicode string here.
16 from cStringIO import StringIO
17 diff_content = StringIO()
18- show_diff_trees(tree_old, tree_new, diff_content)
19+ diff_options = self.config.get_user_option('post_commit_diffoptions')
20+ show_diff_trees(tree_old, tree_new, diff_content, None, diff_options)
21 numlines = diff_content.getvalue().count('\n')+1
22 if numlines <= difflimit:
23 return diff_content.getvalue()

Subscribers

People subscribed via source and target branches

to all changes: