Merge lp:~jteh/bzr-email/fix0difflimit into lp:bzr-email

[James Teh]

Gracefully handle (and clarify documentation about) difflimit being set to 0 to indicate that diffs should not be included.

[Robert Collins (lifeless)]

 review: approve

review: Approve

[Jelmer Vernooij (jelmer)]

I'll merge this, as Rob has already approved it earlier.

=== modified file '__init__.py'
--- __init__.py	2008-12-09 20:09:15 +0000
+++ __init__.py	2010-02-24 12:41:16 +0000
@@ -22,10 +22,10 @@
 ``post_commit_sender`` (if not supplied defaults to the email address reported
 by ``bzr whoami``).
 
-By default, the diff for the commit will be included in the email, if the
-length is less than 1000 lines. This limit can be changed (for instance, to 0
-to disable the feature) by setting the configuration option
-'post_commit_difflimit' to the number of lines you wish it to be limited to.
+By default, the diff for the commit will be included in the email if the
+length is less than 1000 lines. This limit can be changed by setting the
+configuration option 'post_commit_difflimit' to the number of lines you wish
+it to be limited to. Set it to 0 to unconditionally disable sending of diffs.
 
 By default bzr-email only emails when a commit occurs, not when a push or
 pull operation occurs. To email on push or pull set post_commit_push_pull=True
 
=== modified file 'emailer.py'
--- emailer.py	2008-12-09 20:09:15 +0000
+++ emailer.py	2010-02-24 12:41:16 +0000
@@ -195,7 +195,10 @@
             process = subprocess.Popen(self._command_line(),
                                        stdin=subprocess.PIPE)
             try:
-                message = self.body().encode('utf8') + self.get_diff()
+                message = self.body().encode('utf8')
+                diff = self.get_diff()
+                if diff:
+                    message += diff
                 result = process.communicate(message)[0]
                 if process.returncode is None:
                     process.wait()
@@ -227,9 +230,12 @@
             to_addrs = [to_addrs]
 
         smtp = self._smtplib_implementation(self.config)
-        smtp.send_text_and_attachment_email(from_addr, to_addrs,
-                                            subject, body, diff,
-                                            self.diff_filename())
+        if diff:
+            smtp.send_text_and_attachment_email(from_addr, to_addrs,
+                                                subject, body, diff,
+                                                self.diff_filename())
+        else:
+            smtp.send_text_email(from_addr, to_addrs, subject, body)
 
     def should_send(self):
         result = self.config.get_user_option('post_commit_difflimit')