/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: Robert Collins
  • Date: 2008-03-25 04:00:51 UTC
  • mfrom: (3302 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3306.
  • Revision ID: robertc@robertcollins.net-20080325040051-fz86q4klex5dngfi
Merge up bzr.dev.

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)