← Back to branch summary

~bneijt/bzr-hookless-email/multimail

« back to all changes in this revision

Viewing changes to bzr_hookless_email.py

  • Committer: Karl Fogel
  • Date: 2009-08-21 23:46:55 UTC
  • Revision ID: karl.fogel@canonical.com-20090821234655-158gqhdy6d2h51ou
* bzr_hookless_email.py
  (BranchEmailer._compose_email): Remove a spurious "+" that I
    accidentally introduced in r28, and unrelatedly add a "+" that I
    should have added in r28.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr_hookless_email.py
275
275
                numlines = diff_val.count('\n') + 1
276
276
                if numlines > options.line_limit:
277
277
                    diff_already_suppressed = True
278
 
                    diff_val += ("Diff too large for email "
279
 
                                 "(%d lines; the limit is %d).\n" %
280
 
                                 (numlines, options.line_limit))
 
278
                    diff_val = ("Diff too large for email "
 
279
                                "(%d lines; the limit is %d).\n" %
 
280
                                (numlines, options.line_limit))
281
281
            if options.byte_limit > 0:
282
282
                numbytes = len(diff_val)
283
283
                if numbytes > options.byte_limit:
284
284
                    if diff_already_suppressed:
285
285
                        # We must have already encountered a line limit.
286
 
                        diff_val = "(Also exceeds byte limit: " \
287
 
                            "%d bytes, when the limit is %d.)" \
 
286
                        diff_val += "(Also exceeds byte limit: " \
 
287
                            "%d bytes, when the limit is %d.)"   \
288
288
                            % (numbytes, options.byte_limit)
289
289
                    else:
290
290
                        diff_val = ("Diff too large for email "