/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/mail_client.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-03-23 23:11:45 UTC
  • mfrom: (3300.1.2 bzr.ab.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
Fix DefaultMail.compose_merge_request basename (james_w)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mail_client.py
346
346
            return Editor(self.config).compose(prompt, to, subject,
347
347
                          attachment, mimie_subtype, extension)
348
348
 
349
 
    def compose_merge_request(self, to, subject, directive):
 
349
    def compose_merge_request(self, to, subject, directive, basename=None):
350
350
        """See MailClient.compose_merge_request"""
351
351
        try:
352
352
            return self._mail_client().compose_merge_request(to, subject,
353
 
                                                             directive)
 
353
                    directive, basename=basename)
354
354
        except errors.MailClientNotFound:
355
355
            return Editor(self.config).compose_merge_request(to, subject,
356
 
                          directive)
 
356
                          directive, basename=basename)